f2fs: Pass a folio to f2fs_inode_chksum_set()

All callers have 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 008d92dcbbceaf9a9e61d5f117e0a7b0f6fcbfda..cb02452d7fc0814cf5df23f57c06e35995985ed4 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3634,7 +3634,7 @@ int f2fs_pin_file_control(struct inode *inode, bool inc);
  */
 void f2fs_set_inode_flags(struct inode *inode);
 bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio);
-void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct page *page);
+void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct folio *folio);
 struct inode *f2fs_iget(struct super_block *sb, unsigned long ino);
 struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino);
 int f2fs_try_to_free_nats(struct f2fs_sb_info *sbi, int nr_shrink);

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index c5dbc9963e4f385244a8f50b6fcae416b6e4c098..cbee1ce33db72353432d24ee89618ae82e61c958 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -184,14 +184,14 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio)
        return provided == calculated;
 }
 
-void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct page *page)
+void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct folio *folio)
 {
-       struct f2fs_inode *ri = &F2FS_NODE(page)->i;
+       struct f2fs_inode *ri = &F2FS_NODE(&folio->page)->i;
 
-       if (!f2fs_enable_inode_chksum(sbi, page))
+       if (!f2fs_enable_inode_chksum(sbi, &folio->page))
                return;
 
-       ri->i_inode_checksum = cpu_to_le32(f2fs_inode_chksum(sbi, page));
+       ri->i_inode_checksum = cpu_to_le32(f2fs_inode_chksum(sbi, &folio->page));
 }
 
 static bool sanity_check_compress_inode(struct inode *inode,
@@ -752,7 +752,7 @@ void f2fs_update_inode(struct inode *inode, struct folio *node_folio)
 
        init_idisk_time(inode);
 #ifdef CONFIG_F2FS_CHECK_FS
-       f2fs_inode_chksum_set(F2FS_I_SB(inode), &node_folio->page);
+       f2fs_inode_chksum_set(F2FS_I_SB(inode), node_folio);
 #endif
 }
 

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index c9bf269f0fdbbab8681b6fec066fc491ab888742..1565f105c75de4800b623c8f66704e7a6543f96d 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -2215,7 +2215,7 @@ static bool f2fs_dirty_node_folio(struct address_space *mapping,
                folio_mark_uptodate(folio);
 #ifdef CONFIG_F2FS_CHECK_FS
        if (IS_INODE(&folio->page))
-               f2fs_inode_chksum_set(F2FS_M_SB(mapping), &folio->page);
+               f2fs_inode_chksum_set(F2FS_M_SB(mapping), folio);
 #endif
        if (filemap_dirty_folio(mapping, folio)) {
                inc_page_count(F2FS_M_SB(mapping), F2FS_DIRTY_NODES);

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index ca0e9361ab68196f65336f04e2a15284ce222060..4a9544744e46a989e2a37da962adfab1e008d905 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -429,7 +429,7 @@ static inline void set_mark(struct folio *folio, int mark, int type)
        rn->footer.flag = cpu_to_le32(flag);
 
 #ifdef CONFIG_F2FS_CHECK_FS
-       f2fs_inode_chksum_set(F2FS_F_SB(folio), &folio->page);
+       f2fs_inode_chksum_set(F2FS_F_SB(folio), folio);
 #endif
 }
 #define set_dentry_mark(folio, mark)   set_mark(folio, mark, DENT_BIT_SHIFT)

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index ca154a80778f86dc5aba36acff489aa22f68be4f..9279e06d75cad4445e7ad6f9c753028061df8dae 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -3854,7 +3854,7 @@ skip_new_segment:
        if (folio && IS_NODESEG(curseg->seg_type)) {
                fill_node_footer_blkaddr(&folio->page, NEXT_FREE_BLKADDR(sbi, curseg));
 
-               f2fs_inode_chksum_set(sbi, &folio->page);
+               f2fs_inode_chksum_set(sbi, folio);
        }
 
        if (fio) {