fuse: Convert from launder_page to launder_folio

Straightforward conversion although the helper functions still assume
a single page.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Tested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Tested-by: Mike Marshall <hubcap@omnibond.com> # orangefs
Tested-by: David Howells <dhowells@redhat.com> # afs

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 656e921f3506bd75e4d6f2f133a9ae72e95a18d6..9ff27b8a9782c4cb7f2119ea6c1e5fb3bf8dc9d6 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1773,7 +1773,7 @@ int fuse_do_setattr(struct dentry *dentry, struct iattr *attr,
 
        /*
         * Only call invalidate_inode_pages2() after removing
-        * FUSE_NOWRITE, otherwise fuse_launder_page() would deadlock.
+        * FUSE_NOWRITE, otherwise fuse_launder_folio() would deadlock.
         */
        if ((is_truncate || !is_wb) &&
            S_ISREG(inode->i_mode) && oldsize != outarg.attr.size) {

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 8290944517749161840a047d4416b43750b4c5bb..aed0d5dcd02269a4557189b56c101b70af5fab38 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2330,17 +2330,17 @@ unlock:
        return copied;
 }
 
-static int fuse_launder_page(struct page *page)
+static int fuse_launder_folio(struct folio *folio)
 {
        int err = 0;
-       if (clear_page_dirty_for_io(page)) {
-               struct inode *inode = page->mapping->host;
+       if (folio_clear_dirty_for_io(folio)) {
+               struct inode *inode = folio->mapping->host;
 
                /* Serialize with pending writeback for the same page */
-               fuse_wait_on_page_writeback(inode, page->index);
-               err = fuse_writepage_locked(page);
+               fuse_wait_on_page_writeback(inode, folio->index);
+               err = fuse_writepage_locked(&folio->page);
                if (!err)
-                       fuse_wait_on_page_writeback(inode, page->index);
+                       fuse_wait_on_page_writeback(inode, folio->index);
        }
        return err;
 }
@@ -3161,7 +3161,7 @@ static const struct address_space_operations fuse_file_aops  = {
        .readahead      = fuse_readahead,
        .writepage      = fuse_writepage,
        .writepages     = fuse_writepages,
-       .launder_page   = fuse_launder_page,
+       .launder_folio  = fuse_launder_folio,
        .set_page_dirty = __set_page_dirty_nobuffers,
        .bmap           = fuse_bmap,
        .direct_IO      = fuse_direct_IO,