From: Matthew Wilcox (Oracle) Date: Tue, 8 Jul 2025 17:03:04 +0000 (+0100) Subject: f2fs: Pass a folio to f2fs_sanity_check_inline_data() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1f6425e33da270f0ebb8b43f686ba5d1d40cbe2f;p=users%2Fdwmw2%2Flinux.git f2fs: Pass a folio to f2fs_sanity_check_inline_data() The only caller has a folio, so pass it in. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index e075c1b19864a..3efe6a2485585 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h @@ -4308,7 +4308,7 @@ extern struct kmem_cache *f2fs_inode_entry_slab; * inline.c */ bool f2fs_may_inline_data(struct inode *inode); -bool f2fs_sanity_check_inline_data(struct inode *inode, struct page *ipage); +bool f2fs_sanity_check_inline_data(struct inode *inode, struct folio *ifolio); bool f2fs_may_inline_dentry(struct inode *inode); void f2fs_do_read_inline_data(struct folio *folio, struct folio *ifolio); void f2fs_truncate_inline_inode(struct inode *inode, struct folio *ifolio, diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 901c630685ced..0d021c6389228 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c @@ -48,12 +48,12 @@ static bool inode_has_blocks(struct inode *inode, struct page *ipage) return false; } -bool f2fs_sanity_check_inline_data(struct inode *inode, struct page *ipage) +bool f2fs_sanity_check_inline_data(struct inode *inode, struct folio *ifolio) { if (!f2fs_has_inline_data(inode)) return false; - if (inode_has_blocks(inode, ipage)) + if (inode_has_blocks(inode, &ifolio->page)) return false; if (!support_inline_data(inode)) diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index cdb6640719fae..3d1ee92a613c1 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -354,7 +354,7 @@ static bool sanity_check_inode(struct inode *inode, struct folio *node_folio) } } - if (f2fs_sanity_check_inline_data(inode, &node_folio->page)) { + if (f2fs_sanity_check_inline_data(inode, node_folio)) { f2fs_warn(sbi, "%s: inode (ino=%lx, mode=%u) should not have inline_data, run fsck to fix", __func__, inode->i_ino, inode->i_mode); return false;