ocfs2: Convert ocfs2_write_zero_page to use a folio

Removes a conversion of folio to page, and then two hidden conversions
of page back to folio.

Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: Christian Brauner <brauner@kernel.org>

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index ccc57038a9779f7105667c08138d4b3b170ef1db..cfec1782ac2ae1b729382ee9b7b15d625d483a66 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -755,7 +755,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                                 u64 abs_to, struct buffer_head *di_bh)
 {
        struct address_space *mapping = inode->i_mapping;
-       struct page *page;
+       struct folio *folio;
        unsigned long index = abs_from >> PAGE_SHIFT;
        handle_t *handle;
        int ret = 0;
@@ -774,9 +774,10 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                goto out;
        }
 
-       page = find_or_create_page(mapping, index, GFP_NOFS);
-       if (!page) {
-               ret = -ENOMEM;
+       folio = __filemap_get_folio(mapping, index,
+                       FGP_LOCK | FGP_ACCESSED | FGP_CREAT, GFP_NOFS);
+       if (IS_ERR(folio)) {
+               ret = PTR_ERR(folio);
                mlog_errno(ret);
                goto out_commit_trans;
        }
@@ -803,7 +804,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
                 * __block_write_begin and block_commit_write to zero the
                 * whole block.
                 */
-               ret = __block_write_begin(page, block_start + 1, 0,
+               ret = __block_write_begin(&folio->page, block_start + 1, 0,
                                          ocfs2_get_block);
                if (ret < 0) {
                        mlog_errno(ret);
@@ -812,7 +813,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
 
 
                /* must not update i_size! */
-               block_commit_write(page, block_start + 1, block_start + 1);
+               block_commit_write(&folio->page, block_start + 1, block_start + 1);
        }
 
        /*
@@ -833,8 +834,8 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
        }
 
 out_unlock:
-       unlock_page(page);
-       put_page(page);
+       folio_unlock(folio);
+       folio_put(folio);
 out_commit_trans:
        if (handle)
                ocfs2_commit_trans(OCFS2_SB(inode->i_sb), handle);