github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-30 01:53:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

f2fs: Pass a folio to cpver_of_node()

Browse Source 
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>
This commit is contained in:
Matthew Wilcox (Oracle) 2025-07-08 18:03:22 +01:00 committed by Jaegeuk Kim
parent 06bf11829b
commit eca35d6d5a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/f2fs/node.c
View File

@ -1485,7 +1485,7 @@ static int sanity_check_node_footer(struct f2fs_sb_info *sbi,
f2fs_warn(sbi, "inconsistent node block, node_type:%d, nid:%lu, "
"node_footer[nid:%u,ino:%u,ofs:%u,cpver:%llu,blkaddr:%u]",
ntype, nid, nid_of_node(folio), ino_of_node(folio),
ofs_of_node(page), cpver_of_node(page),
ofs_of_node(page), cpver_of_node(folio),
next_blkaddr_of_node(folio));
set_sbi_flag(sbi, SBI_NEED_FSCK);
f2fs_handle_error(sbi, ERROR_INCONSISTENT_FOOTER);

8
fs/f2fs/node.h
View File

@ -262,9 +262,9 @@ static inline unsigned int ofs_of_node(const struct page *node_page)
return flag >> OFFSET_BIT_SHIFT;
}
static inline __u64 cpver_of_node(const struct page *node_page)
static inline __u64 cpver_of_node(const struct folio *node_folio)
{
struct f2fs_node *rn = F2FS_NODE(node_page);
struct f2fs_node *rn = F2FS_NODE(&node_folio->page);
return le64_to_cpu(rn->footer.cp_ver);
}
@ -321,12 +321,12 @@ static inline bool is_recoverable_dnode(const struct folio *folio)
/* Don't care crc part, if fsck.f2fs sets it. */
if (__is_set_ckpt_flags(ckpt, CP_NOCRC_RECOVERY_FLAG))
return (cp_ver << 32) == (cpver_of_node(&folio->page) << 32);
return (cp_ver << 32) == (cpver_of_node(folio) << 32);
if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))
cp_ver |= (cur_cp_crc(ckpt) << 32);
return cp_ver == cpver_of_node(&folio->page);
return cp_ver == cpver_of_node(folio);
}
/*