Commit 17f930e0 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: remove unneeded parameter in find_in_block() 



We can relocate @res_page assignment in find_in_block() to
its caller, so unneeded parameter could be removed for cleanup.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent f99ba9ad

fs/f2fs/dir.c

+6 −11
Original line number Original line Diff line number Diff line
@@ -191,21 +191,15 @@ static unsigned long dir_block_index(unsigned int level, 
static struct f2fs_dir_entry *find_in_block(struct inode *dir,

static struct f2fs_dir_entry *find_in_block(struct inode *dir,

				struct page *dentry_page,

				struct page *dentry_page,

				const struct f2fs_filename *fname,

				const struct f2fs_filename *fname,

				int *max_slots,

				int *max_slots)

				struct page **res_page)

{

{

	struct f2fs_dentry_block *dentry_blk;

	struct f2fs_dentry_block *dentry_blk;

	struct f2fs_dir_entry *de;

	struct f2fs_dentry_ptr d;

	struct f2fs_dentry_ptr d;





	dentry_blk = (struct f2fs_dentry_block *)page_address(dentry_page);

	dentry_blk = (struct f2fs_dentry_block *)page_address(dentry_page);





	make_dentry_ptr_block(dir, &d, dentry_blk);

	make_dentry_ptr_block(dir, &d, dentry_blk);

	de = f2fs_find_target_dentry(&d, fname, max_slots);

	return f2fs_find_target_dentry(&d, fname, max_slots);

	if (de)

		*res_page = dentry_page;



	return de;

}

}





#ifdef CONFIG_UNICODE

#ifdef CONFIG_UNICODE
@@ -331,10 +325,11 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir, 
			}

			}

		}

		}





		de = find_in_block(dir, dentry_page, fname, &max_slots,

		de = find_in_block(dir, dentry_page, fname, &max_slots);

				   res_page);

		if (de) {

		if (de)

			*res_page = dentry_page;

			break;

			break;

		}





		if (max_slots >= s)

		if (max_slots >= s)

			room = true;

			room = true;