f2fs: clean up the force parameter in __submit_merged_write_cond()

The force parameter in __submit_merged_write_cond is redundant, where
`force == true` implies `inode == NULL && folio == NULL && ino == 0` is
true, and `force == false` implies `inode != NULL || folio != NULL ||
ino != 0` is true. Thus, this patch replaces the force parameter with
a stack variable force.

Signed-off-by: Yongpeng Yang <yangyongpeng@xiaomi.com>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 12bf4b6e007597d310292bf1b681941bc14169d2..d4ef26beadbcce9481654127d4bb1fec41fb2dc2 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -664,10 +664,11 @@ unlock_out:
 
 static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,
                                struct inode *inode, struct folio *folio,
-                               nid_t ino, enum page_type type, bool force)
+                               nid_t ino, enum page_type type)
 {
        enum temp_type temp;
        bool ret = true;
+       bool force = !inode && !folio && !ino;
 
        for (temp = HOT; temp < NR_TEMP_TYPE; temp++) {
                if (!force)     {
@@ -689,14 +690,14 @@ static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,
 
 void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type)
 {
-       __submit_merged_write_cond(sbi, NULL, NULL, 0, type, true);
+       __submit_merged_write_cond(sbi, NULL, NULL, 0, type);
 }
 
 void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,
                                struct inode *inode, struct folio *folio,
                                nid_t ino, enum page_type type)
 {
-       __submit_merged_write_cond(sbi, inode, folio, ino, type, false);
+       __submit_merged_write_cond(sbi, inode, folio, ino, type);
 }
 
 void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi)