f2fs: Add f2fs_get_read_data_folio()

Convert f2fs_get_read_data_page() into f2fs_get_read_data_folio() and
add a compatibility wrapper.  Saves seven hidden calls to compound_head().

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/data.c b/fs/f2fs/data.c
index a7bd9b07235a5c31ceda61b81a4be31c6c4f925a..8a26e586f71968f896017d9e5242e4631a6762ee 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1203,18 +1203,17 @@ int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index)
        return err;
 }
 
-struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
-                                    blk_opf_t op_flags, bool for_write,
-                                    pgoff_t *next_pgofs)
+struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index,
+               blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs)
 {
        struct address_space *mapping = inode->i_mapping;
        struct dnode_of_data dn;
-       struct page *page;
+       struct folio *folio;
        int err;
 
-       page = f2fs_grab_cache_page(mapping, index, for_write);
-       if (!page)
-               return ERR_PTR(-ENOMEM);
+       folio = f2fs_grab_cache_folio(mapping, index, for_write);
+       if (IS_ERR(folio))
+               return folio;
 
        if (f2fs_lookup_read_extent_cache_block(inode, index,
                                                &dn.data_blkaddr)) {
@@ -1249,9 +1248,9 @@ struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
                goto put_err;
        }
 got_it:
-       if (PageUptodate(page)) {
-               unlock_page(page);
-               return page;
+       if (folio_test_uptodate(folio)) {
+               folio_unlock(folio);
+               return folio;
        }
 
        /*
@@ -1262,21 +1261,21 @@ got_it:
         * f2fs_init_inode_metadata.
         */
        if (dn.data_blkaddr == NEW_ADDR) {
-               zero_user_segment(page, 0, PAGE_SIZE);
-               if (!PageUptodate(page))
-                       SetPageUptodate(page);
-               unlock_page(page);
-               return page;
+               folio_zero_segment(folio, 0, folio_size(folio));
+               if (!folio_test_uptodate(folio))
+                       folio_mark_uptodate(folio);
+               folio_unlock(folio);
+               return folio;
        }
 
-       err = f2fs_submit_page_read(inode, page_folio(page), dn.data_blkaddr,
+       err = f2fs_submit_page_read(inode, folio, dn.data_blkaddr,
                                                op_flags, for_write);
        if (err)
                goto put_err;
-       return page;
+       return folio;
 
 put_err:
-       f2fs_put_page(page, 1);
+       f2fs_folio_put(folio, true);
        return ERR_PTR(err);
 }
 

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 46eac4d3386baf0fe87c8fdfda37dd32b67e9054..8da92054baa031ebae2742a1e6081a23d8b028a5 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3906,8 +3906,8 @@ int f2fs_reserve_new_blocks(struct dnode_of_data *dn, blkcnt_t count);
 int f2fs_reserve_new_block(struct dnode_of_data *dn);
 int f2fs_get_block_locked(struct dnode_of_data *dn, pgoff_t index);
 int f2fs_reserve_block(struct dnode_of_data *dn, pgoff_t index);
-struct page *f2fs_get_read_data_page(struct inode *inode, pgoff_t index,
-                       blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);
+struct folio *f2fs_get_read_data_folio(struct inode *inode, pgoff_t index,
+               blk_opf_t op_flags, bool for_write, pgoff_t *next_pgofs);
 struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
                                                        pgoff_t *next_pgofs);
 struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,
@@ -3937,6 +3937,16 @@ int f2fs_init_post_read_wq(struct f2fs_sb_info *sbi);
 void f2fs_destroy_post_read_wq(struct f2fs_sb_info *sbi);
 extern const struct iomap_ops f2fs_iomap_ops;
 
+static inline struct page *f2fs_get_read_data_page(struct inode *inode,
+               pgoff_t index, blk_opf_t op_flags, bool for_write,
+               pgoff_t *next_pgofs)
+{
+       struct folio *folio = f2fs_get_read_data_folio(inode, index, op_flags,
+                       for_write, next_pgofs);
+
+       return &folio->page;
+}
+
 /*
  * gc.c
  */