[f2fs-dev] [PATCH 26/27] f2fs: Add f2fs_find_data_folio()

[Matthew Wilcox (Oracle)]

Convert f2fs_find_data_page() to f2fs_find_data_folio() and add a
compatibility wrapper.  Saves six hidden calls to compound_head().
This was the last caller of f2fs_get_read_data_page(), so remove
the compatibility wrapper.

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/data.c | 33 ++++++++++++++++++---------------
 fs/f2fs/f2fs.h | 12 +++++-------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index e891c95bc525..f1554a5a3d7a 100644
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1279,30 +1279,33 @@ struct folio *f2fs_get_read_data_folio(struct inode 
*inode, pgoff_t index,
        return ERR_PTR(err);
 }
 
-struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
+struct folio *f2fs_find_data_folio(struct inode *inode, pgoff_t index,
                                        pgoff_t *next_pgofs)
 {
        struct address_space *mapping = inode->i_mapping;
-       struct page *page;
+       struct folio *folio;
 
-       page = find_get_page_flags(mapping, index, FGP_ACCESSED);
-       if (page && PageUptodate(page))
-               return page;
-       f2fs_put_page(page, 0);
+       folio = __filemap_get_folio(mapping, index, FGP_ACCESSED, 0);
+       if (IS_ERR(folio))
+               goto read;
+       if (folio_test_uptodate(folio))
+               return folio;
+       f2fs_folio_put(folio, false);
 
-       page = f2fs_get_read_data_page(inode, index, 0, false, next_pgofs);
-       if (IS_ERR(page))
-               return page;
+read:
+       folio = f2fs_get_read_data_folio(inode, index, 0, false, next_pgofs);
+       if (IS_ERR(folio))
+               return folio;
 
-       if (PageUptodate(page))
-               return page;
+       if (folio_test_uptodate(folio))
+               return folio;
 
-       wait_on_page_locked(page);
-       if (unlikely(!PageUptodate(page))) {
-               f2fs_put_page(page, 0);
+       folio_wait_locked(folio);
+       if (unlikely(!folio_test_uptodate(folio))) {
+               f2fs_folio_put(folio, false);
                return ERR_PTR(-EIO);
        }
-       return page;
+       return folio;
 }
 
 /*
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index c78ba3c7d642..a2298eca2576 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3897,8 +3897,8 @@ 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 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 folio *f2fs_find_data_folio(struct inode *inode, pgoff_t index,
+               pgoff_t *next_pgofs);
 struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,
                        bool for_write);
 struct page *f2fs_get_new_data_page(struct inode *inode,
@@ -3926,12 +3926,10 @@ 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)
+static inline struct page *f2fs_find_data_page(struct inode *inode,
+               pgoff_t index, pgoff_t *next_pgofs)
 {
-       struct folio *folio = f2fs_get_read_data_folio(inode, index, op_flags,
-                       for_write, next_pgofs);
+       struct folio *folio = f2fs_find_data_folio(inode, index, next_pgofs);
 
        return &folio->page;
 }
-- 
2.47.2



_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel