fuse: Convert fuse to read_folio

This is a "weak" conversion which converts straight back to using pages.
A full conversion should be performed at some point, hopefully by
someone familiar with the filesystem.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 9ff27b8a9782c4cb7f2119ea6c1e5fb3bf8dc9d6..74303d6e987b32d5fbfaa365fb206e7a0d8f1225 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -1957,20 +1957,20 @@ void fuse_init_dir(struct inode *inode)
        fi->rdc.version = 0;
 }
 
-static int fuse_symlink_readpage(struct file *null, struct page *page)
+static int fuse_symlink_read_folio(struct file *null, struct folio *folio)
 {
-       int err = fuse_readlink_page(page->mapping->host, page);
+       int err = fuse_readlink_page(folio->mapping->host, &folio->page);
 
        if (!err)
-               SetPageUptodate(page);
+               folio_mark_uptodate(folio);
 
-       unlock_page(page);
+       folio_unlock(folio);
 
        return err;
 }
 
 static const struct address_space_operations fuse_symlink_aops = {
-       .readpage       = fuse_symlink_readpage,
+       .read_folio     = fuse_symlink_read_folio,
 };
 
 void fuse_init_symlink(struct inode *inode)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index bca8c2135ec53faaee4135af2ccd65a084995d27..05caa2b9272e80be0c81898788a7fa3bcbaf0520 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -857,8 +857,9 @@ static int fuse_do_readpage(struct file *file, struct page *page)
        return 0;
 }
 
-static int fuse_readpage(struct file *file, struct page *page)
+static int fuse_read_folio(struct file *file, struct folio *folio)
 {
+       struct page *page = &folio->page;
        struct inode *inode = page->mapping->host;
        int err;
 
@@ -3174,7 +3175,7 @@ static const struct file_operations fuse_file_operations = {
 };
 
 static const struct address_space_operations fuse_file_aops  = {
-       .readpage       = fuse_readpage,
+       .read_folio     = fuse_read_folio,
        .readahead      = fuse_readahead,
        .writepage      = fuse_writepage,
        .writepages     = fuse_writepages,