[f2fs-dev] [PATCH 068/153] f2fs: Use a folio in f2fs_recover_inode_page()

[Matthew Wilcox (Oracle)]

Save four hidden calls to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/node.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index e63bfdd807b3..225006e6ba32 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2817,7 +2817,7 @@ int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, 
struct page *page)
        struct f2fs_inode *src, *dst;
        nid_t ino = ino_of_node(page);
        struct node_info old_ni, new_ni;
-       struct page *ipage;
+       struct folio *ifolio;
        int err;
 
        err = f2fs_get_node_info(sbi, ino, &old_ni, false);
@@ -2827,8 +2827,8 @@ int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, 
struct page *page)
        if (unlikely(old_ni.blk_addr != NULL_ADDR))
                return -EINVAL;
 retry:
-       ipage = f2fs_grab_cache_page(NODE_MAPPING(sbi), ino, false);
-       if (!ipage) {
+       ifolio = f2fs_grab_cache_folio(NODE_MAPPING(sbi), ino, false);
+       if (IS_ERR(ifolio)) {
                memalloc_retry_wait(GFP_NOFS);
                goto retry;
        }
@@ -2836,13 +2836,13 @@ int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, 
struct page *page)
        /* Should not use this inode from free nid list */
        remove_free_nid(sbi, ino);
 
-       if (!PageUptodate(ipage))
-               SetPageUptodate(ipage);
-       fill_node_footer(ipage, ino, ino, 0, true);
-       set_cold_node(ipage, false);
+       if (!folio_test_uptodate(ifolio))
+               folio_mark_uptodate(ifolio);
+       fill_node_footer(&ifolio->page, ino, ino, 0, true);
+       set_cold_node(&ifolio->page, false);
 
        src = F2FS_INODE(page);
-       dst = F2FS_INODE(ipage);
+       dst = F2FS_INODE(&ifolio->page);
 
        memcpy(dst, src, offsetof(struct f2fs_inode, i_ext));
        dst->i_size = 0;
@@ -2878,8 +2878,8 @@ int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, 
struct page *page)
                WARN_ON(1);
        set_node_addr(sbi, &new_ni, NEW_ADDR, false);
        inc_valid_inode_count(sbi);
-       set_page_dirty(ipage);
-       f2fs_put_page(ipage, 1);
+       folio_mark_dirty(ifolio);
+       f2fs_folio_put(ifolio, true);
        return 0;
 }
 
-- 
2.47.2



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