[f2fs-dev] [PATCH 013/153] f2fs: Use f2fs_folio_wait_writeback()

[Matthew Wilcox (Oracle)]

There were some missing conversions from f2fs_wait_on_page_writeback()
to f2fs_folio_wait_writeback().  Saves a call to compound_head() at each
callsite.

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/checkpoint.c | 3 +--
 fs/f2fs/data.c       | 4 ++--
 fs/f2fs/file.c       | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index fdc310e9f261..55fcb9869531 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -456,8 +456,7 @@ long f2fs_sync_meta_pages(struct f2fs_sb_info *sbi, enum 
page_type type,
                                goto continue_unlock;
                        }
 
-                       f2fs_wait_on_page_writeback(&folio->page, META,
-                                       true, true);
+                       f2fs_folio_wait_writeback(folio, META, true, true);
 
                        if (!folio_clear_dirty_for_io(folio))
                                goto continue_unlock;
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index e668497ed3fc..e6921a53c7a1 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3129,7 +3129,7 @@ static int f2fs_write_cache_pages(struct address_space 
*mapping,
                        if (folio_test_writeback(folio)) {
                                if (wbc->sync_mode == WB_SYNC_NONE)
                                        goto continue_unlock;
-                               f2fs_wait_on_page_writeback(&folio->page, DATA, 
true, true);
+                               f2fs_folio_wait_writeback(folio, DATA, true, 
true);
                        }
 
                        if (!folio_clear_dirty_for_io(folio))
@@ -3624,7 +3624,7 @@ static int f2fs_write_begin(struct file *file, struct 
address_space *mapping,
                }
        }
 
-       f2fs_wait_on_page_writeback(&folio->page, DATA, false, true);
+       f2fs_folio_wait_writeback(folio, DATA, false, true);
 
        if (len == folio_size(folio) || folio_test_uptodate(folio))
                return 0;
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index abbcbb5865a3..25f69a308dde 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -131,7 +131,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
                goto out_sem;
        }
 
-       f2fs_wait_on_page_writeback(folio_page(folio, 0), DATA, false, true);
+       f2fs_folio_wait_writeback(folio, DATA, false, true);
 
        /* wait for GCed page writeback via META_MAPPING */
        f2fs_wait_on_block_writeback(inode, dn.data_blkaddr);
-- 
2.47.2



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel