f2fs: remove unneeded parameter in find_in_block()
authorChao Yu <yuchao0@huawei.com>
Sat, 26 Sep 2020 00:20:46 +0000 (08:20 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Tue, 29 Sep 2020 08:48:34 +0000 (01:48 -0700)
We can relocate @res_page assignment in find_in_block() to
its caller, so unneeded parameter could be removed for cleanup.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/dir.c

index a18f839..74342d9 100644 (file)
@@ -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;