From 06bf11829b495211c3c654332fcd126e1cc59227 Mon Sep 17 00:00:00 2001 From: "Matthew Wilcox (Oracle)" Date: Tue, 8 Jul 2025 18:03:21 +0100 Subject: [PATCH] f2fs: Pass a folio to fill_node_footer() All callers have a folio so pass it in. Also mark it as const to help the compiler. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- fs/f2fs/node.c | 4 ++-- fs/f2fs/node.h | 4 ++-- fs/f2fs/recovery.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index b410f2d125f3..6ac1540d6aab 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c @@ -1380,7 +1380,7 @@ struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs) set_node_addr(sbi, &new_ni, NEW_ADDR, false); f2fs_folio_wait_writeback(folio, NODE, true, true); - fill_node_footer(&folio->page, dn->nid, dn->inode->i_ino, ofs, true); + fill_node_footer(folio, dn->nid, dn->inode->i_ino, ofs, true); set_cold_node(folio, S_ISDIR(dn->inode->i_mode)); if (!folio_test_uptodate(folio)) folio_mark_uptodate(folio); @@ -2827,7 +2827,7 @@ retry: if (!folio_test_uptodate(ifolio)) folio_mark_uptodate(ifolio); - fill_node_footer(&ifolio->page, ino, ino, 0, true); + fill_node_footer(ifolio, ino, ino, 0, true); set_cold_node(ifolio, false); src = F2FS_INODE(folio); diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h index 412ee80afa69..a80be47cd2e5 100644 --- a/fs/f2fs/node.h +++ b/fs/f2fs/node.h @@ -274,10 +274,10 @@ static inline block_t next_blkaddr_of_node(struct folio *node_folio) return le32_to_cpu(rn->footer.next_blkaddr); } -static inline void fill_node_footer(struct page *page, nid_t nid, +static inline void fill_node_footer(const struct folio *folio, nid_t nid, nid_t ino, unsigned int ofs, bool reset) { - struct f2fs_node *rn = F2FS_NODE(page); + struct f2fs_node *rn = F2FS_NODE(&folio->page); unsigned int old_flag = 0; if (reset) diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index ddfb105ad2bd..1e038bc98173 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c @@ -759,7 +759,7 @@ retry_prev: } copy_node_footer(dn.node_folio, folio); - fill_node_footer(&dn.node_folio->page, dn.nid, ni.ino, + fill_node_footer(dn.node_folio, dn.nid, ni.ino, ofs_of_node(&folio->page), false); folio_mark_dirty(dn.node_folio); err: -- 2.25.1