f2fs: Add f2fs_get_lock_data_folio()

Convert f2fs_get_lock_data_page() to f2fs_get_lock_data_folio() and
add a compatibility wrapper.  Removes three 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 8a26e586f71968f896017d9e5242e4631a6762ee..0359b0c300d6f67a5ef2ec58ae948fc37c384684 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1310,23 +1310,23 @@ struct page *f2fs_find_data_page(struct inode *inode, pgoff_t index,
  * Because, the callers, functions in dir.c and GC, should be able to know
  * whether this page exists or not.
  */
-struct page *f2fs_get_lock_data_page(struct inode *inode, pgoff_t index,
+struct folio *f2fs_get_lock_data_folio(struct inode *inode, pgoff_t index,
                                                        bool for_write)
 {
        struct address_space *mapping = inode->i_mapping;
-       struct page *page;
+       struct folio *folio;
 
-       page = f2fs_get_read_data_page(inode, index, 0, for_write, NULL);
-       if (IS_ERR(page))
-               return page;
+       folio = f2fs_get_read_data_folio(inode, index, 0, for_write, NULL);
+       if (IS_ERR(folio))
+               return folio;
 
        /* wait for read completion */
-       lock_page(page);
-       if (unlikely(page->mapping != mapping || !PageUptodate(page))) {
-               f2fs_put_page(page, 1);
+       folio_lock(folio);
+       if (unlikely(folio->mapping != mapping || !folio_test_uptodate(folio))) {
+               f2fs_folio_put(folio, true);
                return ERR_PTR(-EIO);
        }
-       return page;
+       return folio;
 }
 
 /*

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 8da92054baa031ebae2742a1e6081a23d8b028a5..8939cfb5bc906c2fc5bced7bba21101cb21785bc 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3910,7 +3910,7 @@ 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,
+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,
                        struct page *ipage, pgoff_t index, bool new_i_size);
@@ -3947,6 +3947,14 @@ static inline struct page *f2fs_get_read_data_page(struct inode *inode,
        return &folio->page;
 }
 
+static inline struct page *f2fs_get_lock_data_page(struct inode *inode,
+               pgoff_t index, bool for_write)
+{
+       struct folio *folio = f2fs_get_lock_data_folio(inode, index, for_write);
+
+       return &folio->page;
+}
+
 /*
  * gc.c
  */