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

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

fs/erofs/internal.h

+0 −6
Original line number Diff line number Diff line
@@ -344,12 +344,6 @@ static inline erofs_off_t erofs_iloc(struct inode *inode) 
		(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,

					  unsigned int bits)

{

fs/erofs/namei.c

+5 −13
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 * Copyright (C) 2022, Alibaba Cloud

 */

#include "xattr.h"



#include <trace/events/erofs.h>



struct erofs_qstr {
@@ -87,19 +86,13 @@ static struct erofs_dirent *find_target_dirent(struct erofs_qstr *name, 
	return ERR_PTR(-ENOENT);

}



static void *find_target_block_classic(struct erofs_buf *target,

				       struct inode *dir,

				       struct erofs_qstr *name,

				       int *_ndirents)

static void *erofs_find_target_block(struct erofs_buf *target,

		struct inode *dir, struct erofs_qstr *name, int *_ndirents)

{

	unsigned int startprfx, endprfx;

	int head, back;

	int head = 0, back = DIV_ROUND_UP(dir->i_size, EROFS_BLKSIZ) - 1;

	unsigned int startprfx = 0, endprfx = 0;

	void *candidate = ERR_PTR(-ENOENT);



	startprfx = endprfx = 0;

	head = 0;

	back = erofs_inode_datablocks(dir) - 1;



	while (head <= back) {

		const int mid = head + (back - head) / 2;

		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, 
	qn.end = name->name + name->len;



	ndirents = 0;



	de = find_target_block_classic(&buf, dir, &qn, &ndirents);

	de = erofs_find_target_block(&buf, dir, &qn, &ndirents);

	if (IS_ERR(de))

		return PTR_ERR(de);