f2fs: remove unneeded parameter in find_in_block() (17f930e0) · Commits · 戴 / test

fs/f2fs/dir.c

+6 −11

Original line number	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,
		struct page *dentry_page,
		const struct f2fs_filename *fname,
		int *max_slots,
		struct page **res_page)
		int *max_slots)
		{
		struct f2fs_dentry_block *dentry_blk;
		struct f2fs_dir_entry *de;
		struct f2fs_dentry_ptr d;

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

		make_dentry_ptr_block(dir, &d, dentry_blk);
		de = f2fs_find_target_dentry(&d, fname, max_slots);
		if (de)
		*res_page = dentry_page;

		return de;
		return f2fs_find_target_dentry(&d, fname, max_slots);
		}

		#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,
		res_page);
		if (de)
		de = find_in_block(dir, dentry_page, fname, &max_slots);
		if (de) {
		*res_page = dentry_page;
		break;
		}

		if (max_slots >= s)
		room = true;