f2fs: Pass a folio to f2fs_submit_merged_write_cond()

Most callers pass NULL, and the one that passes a page already has a
folio.  Also convert __submit_merged_write_cond() to take a folio.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
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 90f7a85fa7b645de797968a9f3f16a53d3296a84..7cba071db401999d0a2a5e43eee437e0e944d45e 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -638,7 +638,7 @@ unlock_out:
 }
 
 static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,
-                               struct inode *inode, struct page *page,
+                               struct inode *inode, struct folio *folio,
                                nid_t ino, enum page_type type, bool force)
 {
        enum temp_type temp;
@@ -650,7 +650,7 @@ static void __submit_merged_write_cond(struct f2fs_sb_info *sbi,
                        struct f2fs_bio_info *io = sbi->write_io[btype] + temp;
 
                        f2fs_down_read(&io->io_rwsem);
-                       ret = __has_merged_page(io->bio, inode, page, ino);
+                       ret = __has_merged_page(io->bio, inode, &folio->page, ino);
                        f2fs_up_read(&io->io_rwsem);
                }
                if (ret)
@@ -668,10 +668,10 @@ void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type)
 }
 
 void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,
-                               struct inode *inode, struct page *page,
+                               struct inode *inode, struct folio *folio,
                                nid_t ino, enum page_type type)
 {
-       __submit_merged_write_cond(sbi, inode, page, ino, type, false);
+       __submit_merged_write_cond(sbi, inode, folio, ino, type, false);
 }
 
 void f2fs_flush_merged_writes(struct f2fs_sb_info *sbi)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 1b3708480c3067d553418cad0cfe57789165fe19..8e092f4fd67007bbc328dae4d4865c604de95b4a 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3982,7 +3982,7 @@ void f2fs_submit_read_bio(struct f2fs_sb_info *sbi, struct bio *bio,
 int f2fs_init_write_merge_io(struct f2fs_sb_info *sbi);
 void f2fs_submit_merged_write(struct f2fs_sb_info *sbi, enum page_type type);
 void f2fs_submit_merged_write_cond(struct f2fs_sb_info *sbi,
-                               struct inode *inode, struct page *page,
+                               struct inode *inode, struct folio *folio,
                                nid_t ino, enum page_type type);
 void f2fs_submit_merged_ipu_write(struct f2fs_sb_info *sbi,
                                        struct bio **bio, struct folio *folio);

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 909637873ff7b633cc501253c1e72c1dbbdad76f..cc82d42ef14c58668586a4adb8c52faddf0cccb2 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -4197,7 +4197,7 @@ void f2fs_folio_wait_writeback(struct folio *folio, enum page_type type,
                struct f2fs_sb_info *sbi = F2FS_F_SB(folio);
 
                /* submit cached LFS IO */
-               f2fs_submit_merged_write_cond(sbi, NULL, &folio->page, 0, type);
+               f2fs_submit_merged_write_cond(sbi, NULL, folio, 0, type);
                /* submit cached IPU IO */
                f2fs_submit_merged_ipu_write(sbi, NULL, folio);
                if (ordered) {