Skip to contentSkip to conversation

f2fs: remove unneeded parameter in find_in_block()

PATCH New Chao Yu 1 participant 1 message Sep 26, 2020 F2FS file system

lore
Share & tools
lore

Chao Yu

author maintainer
#0 lore raw

PATCH 1/1 f2fs: remove unneeded parameter in find_in_block()

From: Chao Yu <[email protected]>

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

---
 fs/f2fs/dir.c | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)
fs/f2fs/dir.c +6 -11
index ceb4431b5669..8d98597d3960 100644
@@ -190,21 +190,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
@@ -330,10 +324,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;
Signature · 1 line
2.22.0