f2fs: Pass a folio to f2fs_recover_xattr_data()

One caller passes NULL and the other caller already 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 cb02452d7fc0814cf5df23f57c06e35995985ed4..69b7667239601badf8f31d67c1bd3e2a98dcb11e 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3790,7 +3790,7 @@ void f2fs_alloc_nid_done(struct f2fs_sb_info *sbi, nid_t nid);
 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_xattr_data(struct inode *inode, struct folio *folio);
 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);

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 1e7bec223dbe5a27f6b409bac04740ea67782892..9c4052282c8ca09eb19938ae43cc64ca7d4e39ec 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2753,7 +2753,7 @@ update_inode:
        return 0;
 }
 
-int f2fs_recover_xattr_data(struct inode *inode, struct page *page)
+int f2fs_recover_xattr_data(struct inode *inode, struct folio *folio)
 {
        struct f2fs_sb_info *sbi = F2FS_I_SB(inode);
        nid_t prev_xnid = F2FS_I(inode)->i_xattr_nid;
@@ -2791,8 +2791,8 @@ recover_xnid:
        f2fs_update_inode_page(inode);
 
        /* 3: update and set xattr node page dirty */
-       if (page) {
-               memcpy(F2FS_NODE(&xfolio->page), F2FS_NODE(page),
+       if (folio) {
+               memcpy(F2FS_NODE(&xfolio->page), F2FS_NODE(&folio->page),
                                VALID_XATTR_BLOCK_SIZE);
                folio_mark_dirty(xfolio);
        }

diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c
index 1e038bc9817310413833500cf2cee1e16d3697cc..7d63a74e9ca66cffa906c71384a6fbfb12c4fee3 100644 (file)
--- a/fs/f2fs/recovery.c
+++ b/fs/f2fs/recovery.c
@@ -633,7 +633,7 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode,
                if (err)
                        goto out;
        } else if (f2fs_has_xattr_block(ofs_of_node(&folio->page))) {
-               err = f2fs_recover_xattr_data(inode, &folio->page);
+               err = f2fs_recover_xattr_data(inode, folio);
                if (!err)
                        recovered++;
                goto out;