f2fs: Pass a folio to f2fs_recover_inode_page()

The only caller has a folio, so pass it in.

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/f2fs.h b/fs/f2fs/f2fs.h
index 493f1c5fb2d59f2595eff7c8b8d966ac8aba36df..e51ba3585d3cb9dbee280cd9fca22214e3e9065b 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3790,7 +3790,7 @@ void f2fs_alloc_nid_failed(struct f2fs_sb_info *sbi, nid_t nid);
 int f2fs_try_to_free_nids(struct f2fs_sb_info *sbi, int nr_shrink);
 int f2fs_recover_inline_xattr(struct inode *inode, struct folio *folio);
 int f2fs_recover_xattr_data(struct inode *inode, struct page *page);
-int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page);
+int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct folio *folio);
 int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,
                        unsigned int segno, struct f2fs_summary_block *sum);
 int f2fs_flush_nat_entries(struct f2fs_sb_info *sbi, struct cp_control *cpc);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index be3d38d1fdeec9035fc5d33ca3049da4817bdbfb..a9aade30c4cb3119f4ce700b0f95bd2e7cf92317 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2801,10 +2801,10 @@ recover_xnid:
        return 0;
 }
 
-int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct page *page)
+int f2fs_recover_inode_page(struct f2fs_sb_info *sbi, struct folio *folio)
 {
        struct f2fs_inode *src, *dst;
-       nid_t ino = ino_of_node(page);
+       nid_t ino = ino_of_node(&folio->page);
        struct node_info old_ni, new_ni;
        struct folio *ifolio;
        int err;
@@ -2830,7 +2830,7 @@ retry:
        fill_node_footer(&ifolio->page, ino, ino, 0, true);
        set_cold_node(&ifolio->page, false);
 
-       src = F2FS_INODE(page);
+       src = F2FS_INODE(&folio->page);
        dst = F2FS_INODE(&ifolio->page);
 
        memcpy(dst, src, offsetof(struct f2fs_inode, i_ext));

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index cb6217e6475f37a3e054d20eaba2b9bacf393454..5120713ffd53347bdcf988ee1be02729c1be82b5 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -439,7 +439,7 @@ static int find_fsync_dnodes(struct f2fs_sb_info *sbi, struct list_head *head,
                        if (!check_only &&
                                        IS_INODE(&folio->page) &&
                                        is_dent_dnode(&folio->page)) {
-                               err = f2fs_recover_inode_page(sbi, &folio->page);
+                               err = f2fs_recover_inode_page(sbi, folio);
                                if (err) {
                                        f2fs_folio_put(folio, true);
                                        break;