ocfs2: Convert ocfs2 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/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index 49f41074baadd194d989debdb291b2333f6512e2..51c93929a1461d6b5ea79226d96d59544a6795e1 100644 (file)
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -7427,7 +7427,7 @@ int ocfs2_truncate_inline(struct inode *inode, struct buffer_head *di_bh,
        /*
         * No need to worry about the data page here - it's been
         * truncated already and inline data doesn't need it for
-        * pushing zero's to disk, so we'll let readpage pick it up
+        * pushing zero's to disk, so we'll let read_folio pick it up
         * later.
         */
        if (trunc) {

diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c
index 7bf4b6fd93bf093b286115f238d361880890d2d9..6b1679db96369909749feae27e9f76ef3d1aff56 100644 (file)
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
@@ -275,8 +275,9 @@ out:
        return ret;
 }
 
-static int ocfs2_readpage(struct file *file, struct page *page)
+static int ocfs2_read_folio(struct file *file, struct folio *folio)
 {
+       struct page *page = &folio->page;
        struct inode *inode = page->mapping->host;
        struct ocfs2_inode_info *oi = OCFS2_I(inode);
        loff_t start = (loff_t)page->index << PAGE_SHIFT;
@@ -2454,7 +2455,7 @@ static ssize_t ocfs2_direct_IO(struct kiocb *iocb, struct iov_iter *iter)
 
 const struct address_space_operations ocfs2_aops = {
        .dirty_folio            = block_dirty_folio,
-       .readpage               = ocfs2_readpage,
+       .read_folio             = ocfs2_read_folio,
        .readahead              = ocfs2_readahead,
        .writepage              = ocfs2_writepage,
        .write_begin            = ocfs2_write_begin,

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 01b7407a8893f0af1e7bb0d596035c66e8043cd3..7497cd59225861d4521df92e83b25277e02b09e3 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2526,7 +2526,7 @@ static ssize_t ocfs2_file_read_iter(struct kiocb *iocb,
                return -EOPNOTSUPP;
 
        /*
-        * buffered reads protect themselves in ->readpage().  O_DIRECT reads
+        * buffered reads protect themselves in ->read_folio().  O_DIRECT reads
         * need locks to protect pending reads from racing with truncate.
         */
        if (direct_io) {

diff --git a/fs/ocfs2/symlink.c b/fs/ocfs2/symlink.c
index f755a49858216018e719dc0892536418b2e90bcf..d4c5fdcfa1e464684be4f3a2c5d31d4c4156b496 100644 (file)
--- a/fs/ocfs2/symlink.c
+++ b/fs/ocfs2/symlink.c
@@ -52,8 +52,9 @@
 #include "buffer_head_io.h"
 
 
-static int ocfs2_fast_symlink_readpage(struct file *unused, struct page *page)
+static int ocfs2_fast_symlink_read_folio(struct file *f, struct folio *folio)
 {
+       struct page *page = &folio->page;
        struct inode *inode = page->mapping->host;
        struct buffer_head *bh = NULL;
        int status = ocfs2_read_inode_block(inode, &bh);
@@ -81,7 +82,7 @@ static int ocfs2_fast_symlink_readpage(struct file *unused, struct page *page)
 }
 
 const struct address_space_operations ocfs2_fast_symlink_aops = {
-       .readpage               = ocfs2_fast_symlink_readpage,
+       .read_folio             = ocfs2_fast_symlink_read_folio,
 };
 
 const struct inode_operations ocfs2_symlink_inode_operations = {