f2fs: Pass a folio to fill_node_footer_blkaddr()

The only caller has 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/node.h b/fs/f2fs/node.h
index 4a9544744e46a989e2a37da962adfab1e008d905..539dc7b704c0da54155727f74cb182b4817445be 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -300,10 +300,10 @@ static inline void copy_node_footer(struct page *dst, struct page *src)
        memcpy(&dst_rn->footer, &src_rn->footer, sizeof(struct node_footer));
 }
 
-static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr)
+static inline void fill_node_footer_blkaddr(struct folio *folio, block_t blkaddr)
 {
-       struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_P_SB(page));
-       struct f2fs_node *rn = F2FS_NODE(page);
+       struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_F_SB(folio));
+       struct f2fs_node *rn = F2FS_NODE(&folio->page);
        __u64 cp_ver = cur_cp_version(ckpt);
 
        if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))

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