f2fs: Add f2fs_folio_wait_writeback()

Convert f2fs_wait_on_page_writeback() to f2fs_folio_wait_writeback()
and add a compatibiility wrapper.  Replaces five calls to
compound_head() with one.

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/f2fs.h b/fs/f2fs/f2fs.h
index 05879c6dc4d6c77aea9f831c11745552626ad065..645a53a1f39fb3641a36e7ac90493b366152f575 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3769,8 +3769,10 @@ int f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
                        struct f2fs_io_info *fio);
 void f2fs_update_device_state(struct f2fs_sb_info *sbi, nid_t ino,
                                        block_t blkaddr, unsigned int blkcnt);
-void f2fs_wait_on_page_writeback(struct page *page,
-                       enum page_type type, bool ordered, bool locked);
+void f2fs_folio_wait_writeback(struct folio *folio, enum page_type type,
+               bool ordered, bool locked);
+#define f2fs_wait_on_page_writeback(page, type, ordered, locked)       \
+               f2fs_folio_wait_writeback(page_folio(page), type, ordered, locked)
 void f2fs_wait_on_block_writeback(struct inode *inode, block_t blkaddr);
 void f2fs_wait_on_block_writeback_range(struct inode *inode, block_t blkaddr,
                                                                block_t len);

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 2b415926641f0d07ed303c8ca1b2e25bb6c5af42..fd1f6e924e0f9e4bd539ad5f716404dc66a89865 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -4153,22 +4153,21 @@ void f2fs_replace_block(struct f2fs_sb_info *sbi, struct dnode_of_data *dn,
        f2fs_update_data_blkaddr(dn, new_addr);
 }
 
-void f2fs_wait_on_page_writeback(struct page *page,
-                               enum page_type type, bool ordered, bool locked)
+void f2fs_folio_wait_writeback(struct folio *folio, enum page_type type,
+               bool ordered, bool locked)
 {
-       if (folio_test_writeback(page_folio(page))) {
-               struct f2fs_sb_info *sbi = F2FS_P_SB(page);
+       if (folio_test_writeback(folio)) {
+               struct f2fs_sb_info *sbi = F2FS_F_SB(folio);
 
                /* submit cached LFS IO */
-               f2fs_submit_merged_write_cond(sbi, NULL, page, 0, type);
+               f2fs_submit_merged_write_cond(sbi, NULL, &folio->page, 0, type);
                /* submit cached IPU IO */
-               f2fs_submit_merged_ipu_write(sbi, NULL, page);
+               f2fs_submit_merged_ipu_write(sbi, NULL, &folio->page);
                if (ordered) {
-                       wait_on_page_writeback(page);
-                       f2fs_bug_on(sbi, locked &&
-                               folio_test_writeback(page_folio(page)));
+                       folio_wait_writeback(folio);
+                       f2fs_bug_on(sbi, locked && folio_test_writeback(folio));
                } else {
-                       wait_for_stable_page(page);
+                       folio_wait_stable(folio);
                }
        }
 }