[f2fs-dev] [PATCH 067/153] f2fs: Pass a folio to f2fs_inode_chksum_verify()

[Matthew Wilcox (Oracle)]

Both callers now have a folio, so pass it in.  Removes three calls
to compound_head().

Signed-off-by: Matthew Wilcox (Oracle) <wi...@infradead.org>
---
 fs/f2fs/f2fs.h  |  2 +-
 fs/f2fs/inode.c | 16 ++++++++--------
 fs/f2fs/node.c  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 11e63c5f524a..d975d7f7d269 100644
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -3597,7 +3597,7 @@ int f2fs_pin_file_control(struct inode *inode, bool inc);
  * inode.c
  */
 void f2fs_set_inode_flags(struct inode *inode);
-bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page);
+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);
 struct inode *f2fs_iget(struct super_block *sb, unsigned long ino);
 struct inode *f2fs_iget_retry(struct super_block *sb, unsigned long ino);
diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 83f862578fc8..38512f2d4b28 100644
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -154,7 +154,7 @@ static __u32 f2fs_inode_chksum(struct f2fs_sb_info *sbi, 
struct page *page)
        return chksum;
 }
 
-bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct page *page)
+bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio)
 {
        struct f2fs_inode *ri;
        __u32 provided, calculated;
@@ -163,21 +163,21 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, 
struct page *page)
                return true;
 
 #ifdef CONFIG_F2FS_CHECK_FS
-       if (!f2fs_enable_inode_chksum(sbi, page))
+       if (!f2fs_enable_inode_chksum(sbi, &folio->page))
 #else
-       if (!f2fs_enable_inode_chksum(sbi, page) ||
-                       PageDirty(page) ||
-                       folio_test_writeback(page_folio(page)))
+       if (!f2fs_enable_inode_chksum(sbi, &folio->page) ||
+                       folio_test_dirty(folio) ||
+                       folio_test_writeback(folio))
 #endif
                return true;
 
-       ri = &F2FS_NODE(page)->i;
+       ri = &F2FS_NODE(&folio->page)->i;
        provided = le32_to_cpu(ri->i_inode_checksum);
-       calculated = f2fs_inode_chksum(sbi, page);
+       calculated = f2fs_inode_chksum(sbi, &folio->page);
 
        if (provided != calculated)
                f2fs_warn(sbi, "checksum invalid, nid = %lu, ino_of_node = %x, 
%x vs. %x",
-                         page_folio(page)->index, ino_of_node(page),
+                         folio->index, ino_of_node(&folio->page),
                          provided, calculated);
 
        return provided == calculated;
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index f1f0d5159f2d..e63bfdd807b3 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1403,7 +1403,7 @@ static int read_node_folio(struct folio *folio, blk_opf_t 
op_flags)
        int err;
 
        if (folio_test_uptodate(folio)) {
-               if (!f2fs_inode_chksum_verify(sbi, &folio->page)) {
+               if (!f2fs_inode_chksum_verify(sbi, folio)) {
                        folio_clear_uptodate(folio);
                        return -EFSBADCRC;
                }
@@ -1517,7 +1517,7 @@ static struct folio *__get_node_folio(struct f2fs_sb_info 
*sbi, pgoff_t nid,
                goto out_err;
        }
 
-       if (!f2fs_inode_chksum_verify(sbi, &folio->page)) {
+       if (!f2fs_inode_chksum_verify(sbi, folio)) {
                err = -EFSBADCRC;
                goto out_err;
        }
-- 
2.47.2



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