f2fs: Use f2fs_folio_wait_writeback()

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) <willy@infradead.org>
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 5d5cd4ee21fba8cf7dfab95919cfe0d0cdeef978..f5f0915dde79f14d44566c8dcf143bc758c319c2 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -456,8 +456,7 @@ continue_unlock:
                                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 2b3147148cc62ad62ad0ad2c1e2174ff5e904452..2e901403000dd481821448ea8015a8ef74961fdd 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3128,7 +3128,7 @@ continue_unlock:
                        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))
@@ -3623,7 +3623,7 @@ repeat:
                }
        }
 
-       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 a719469767613c6ae8f86ee0fdef4e3e9bc89aec..6c8250af129aa707792b41f4e02576ba10305b02 100644 (file)
--- 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);