f2fs: Convert to release_folio

While converting f2fs_release_page() to f2fs_release_folio(), cache the
sb_info so we don't need to retrieve it twice, and remove the redundant
call to set_page_private().  The use of folios should be pushed further
into f2fs from here.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Jeff Layton <jlayton@kernel.org>

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 909085a78f9c3f0535d00e8c0bca06cf844d35fb..456c1e89386aa31eb588c978f7cccc3b91859b62 100644 (file)
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -468,7 +468,7 @@ const struct address_space_operations f2fs_meta_aops = {
        .writepages     = f2fs_write_meta_pages,
        .dirty_folio    = f2fs_dirty_meta_folio,
        .invalidate_folio = f2fs_invalidate_folio,
-       .releasepage    = f2fs_release_page,
+       .release_folio  = f2fs_release_folio,
 #ifdef CONFIG_MIGRATION
        .migratepage    = f2fs_migrate_page,
 #endif

diff --git a/fs/f2fs/compress.c b/fs/f2fs/compress.c
index 12a56f9e15722db10f2d0adbeaae61fcfb471ca7..24824cd96f36751f9daaae583e8a431faeba0a57 100644 (file)
--- a/fs/f2fs/compress.c
+++ b/fs/f2fs/compress.c
@@ -1746,7 +1746,7 @@ unsigned int f2fs_cluster_blocks_are_contiguous(struct dnode_of_data *dn)
 }
 
 const struct address_space_operations f2fs_compress_aops = {
-       .releasepage = f2fs_release_page,
+       .release_folio = f2fs_release_folio,
        .invalidate_folio = f2fs_invalidate_folio,
 };
 

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index f894267f0722531ec898410ac8739e3832036210..8f38c26bb16ca5980fa4462cfc40ac17af60bfb5 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -3528,28 +3528,30 @@ void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length)
        folio_detach_private(folio);
 }
 
-int f2fs_release_page(struct page *page, gfp_t wait)
+bool f2fs_release_folio(struct folio *folio, gfp_t wait)
 {
-       /* If this is dirty page, keep PagePrivate */
-       if (PageDirty(page))
-               return 0;
+       struct f2fs_sb_info *sbi;
+
+       /* If this is dirty folio, keep private data */
+       if (folio_test_dirty(folio))
+               return false;
 
        /* This is atomic written page, keep Private */
-       if (page_private_atomic(page))
-               return 0;
+       if (page_private_atomic(&folio->page))
+               return false;
 
-       if (test_opt(F2FS_P_SB(page), COMPRESS_CACHE)) {
-               struct inode *inode = page->mapping->host;
+       sbi = F2FS_M_SB(folio->mapping);
+       if (test_opt(sbi, COMPRESS_CACHE)) {
+               struct inode *inode = folio->mapping->host;
 
-               if (inode->i_ino == F2FS_COMPRESS_INO(F2FS_I_SB(inode)))
-                       clear_page_private_data(page);
+               if (inode->i_ino == F2FS_COMPRESS_INO(sbi))
+                       clear_page_private_data(&folio->page);
        }
 
-       clear_page_private_gcing(page);
+       clear_page_private_gcing(&folio->page);
 
-       detach_page_private(page);
-       set_page_private(page, 0);
-       return 1;
+       folio_detach_private(folio);
+       return true;
 }
 
 static bool f2fs_dirty_data_folio(struct address_space *mapping,
@@ -3944,7 +3946,7 @@ const struct address_space_operations f2fs_dblock_aops = {
        .write_end      = f2fs_write_end,
        .dirty_folio    = f2fs_dirty_data_folio,
        .invalidate_folio = f2fs_invalidate_folio,
-       .releasepage    = f2fs_release_page,
+       .release_folio  = f2fs_release_folio,
        .direct_IO      = noop_direct_IO,
        .bmap           = f2fs_bmap,
        .swap_activate  = f2fs_swap_activate,

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 18df53ef3d7e56cb4d2652d8d980628121558e40..73ebac078884ead31e68198dd561bb3fb3faf623 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3768,7 +3768,7 @@ int f2fs_write_single_data_page(struct page *page, int *submitted,
                                int compr_blocks, bool allow_balance);
 void f2fs_write_failed(struct inode *inode, loff_t to);
 void f2fs_invalidate_folio(struct folio *folio, size_t offset, size_t length);
-int f2fs_release_page(struct page *page, gfp_t wait);
+bool f2fs_release_folio(struct folio *folio, gfp_t wait);
 #ifdef CONFIG_MIGRATION
 int f2fs_migrate_page(struct address_space *mapping, struct page *newpage,
                        struct page *page, enum migrate_mode mode);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index c45d341dcf6e536fd1f5458621dcdb61cfa9f592..8ccff18560ff1af4ca8fc35a3dd56ddd6a14a5ed 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2165,7 +2165,7 @@ const struct address_space_operations f2fs_node_aops = {
        .writepages     = f2fs_write_node_pages,
        .dirty_folio    = f2fs_dirty_node_folio,
        .invalidate_folio = f2fs_invalidate_folio,
-       .releasepage    = f2fs_release_page,
+       .release_folio  = f2fs_release_folio,
 #ifdef CONFIG_MIGRATION
        .migratepage    = f2fs_migrate_page,
 #endif