Commit 4efdec36 authored by Gao Xiang's avatar Gao Xiang

erofs: get rid of erofs_inode_datablocks()

erofs_inode_datablocks() has the only one caller, let's just get
rid of it entirely.  No logic changes.
Reviewed-by: default avatarYue Hu <huyue2@coolpad.com>
Reviewed-by: default avatarJingbo Xu <jefflexu@linux.alibaba.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarGao Xiang <hsiangkao@linux.alibaba.com>
Link: https://lore.kernel.org/r/20230204093040.97967-1-hsiangkao@linux.alibaba.com
parent b780d3fc
...@@ -344,12 +344,6 @@ static inline erofs_off_t erofs_iloc(struct inode *inode) ...@@ -344,12 +344,6 @@ static inline erofs_off_t erofs_iloc(struct inode *inode)
(EROFS_I(inode)->nid << sbi->islotbits); (EROFS_I(inode)->nid << sbi->islotbits);
} }
static inline unsigned long erofs_inode_datablocks(struct inode *inode)
{
/* since i_size cannot be changed */
return DIV_ROUND_UP(inode->i_size, EROFS_BLKSIZ);
}
static inline unsigned int erofs_bitrange(unsigned int value, unsigned int bit, static inline unsigned int erofs_bitrange(unsigned int value, unsigned int bit,
unsigned int bits) unsigned int bits)
{ {
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
* Copyright (C) 2022, Alibaba Cloud * Copyright (C) 2022, Alibaba Cloud
*/ */
#include "xattr.h" #include "xattr.h"
#include <trace/events/erofs.h> #include <trace/events/erofs.h>
struct erofs_qstr { struct erofs_qstr {
...@@ -87,19 +86,13 @@ static struct erofs_dirent *find_target_dirent(struct erofs_qstr *name, ...@@ -87,19 +86,13 @@ static struct erofs_dirent *find_target_dirent(struct erofs_qstr *name,
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }
static void *find_target_block_classic(struct erofs_buf *target, static void *erofs_find_target_block(struct erofs_buf *target,
struct inode *dir, struct inode *dir, struct erofs_qstr *name, int *_ndirents)
struct erofs_qstr *name,
int *_ndirents)
{ {
unsigned int startprfx, endprfx; int head = 0, back = DIV_ROUND_UP(dir->i_size, EROFS_BLKSIZ) - 1;
int head, back; unsigned int startprfx = 0, endprfx = 0;
void *candidate = ERR_PTR(-ENOENT); void *candidate = ERR_PTR(-ENOENT);
startprfx = endprfx = 0;
head = 0;
back = erofs_inode_datablocks(dir) - 1;
while (head <= back) { while (head <= back) {
const int mid = head + (back - head) / 2; const int mid = head + (back - head) / 2;
struct erofs_buf buf = __EROFS_BUF_INITIALIZER; struct erofs_buf buf = __EROFS_BUF_INITIALIZER;
...@@ -180,8 +173,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid, ...@@ -180,8 +173,7 @@ int erofs_namei(struct inode *dir, const struct qstr *name, erofs_nid_t *nid,
qn.end = name->name + name->len; qn.end = name->name + name->len;
ndirents = 0; ndirents = 0;
de = erofs_find_target_block(&buf, dir, &qn, &ndirents);
de = find_target_block_classic(&buf, dir, &qn, &ndirents);
if (IS_ERR(de)) if (IS_ERR(de))
return PTR_ERR(de); return PTR_ERR(de);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment