f2fs: Pass a folio to F2FS_NODE()

All callers now 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>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 73f80b2514d15b66481ae8adf0a1f665ab56e9af..0122da864db4f6207cfc26dc90607648d568b270 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -2051,9 +2051,9 @@ static inline struct f2fs_checkpoint *F2FS_CKPT(struct f2fs_sb_info *sbi)
        return (struct f2fs_checkpoint *)(sbi->ckpt);
 }
 
-static inline struct f2fs_node *F2FS_NODE(const struct page *page)
+static inline struct f2fs_node *F2FS_NODE(const struct folio *folio)
 {
-       return (struct f2fs_node *)page_address(page);
+       return (struct f2fs_node *)folio_address(folio);
 }
 
 static inline struct f2fs_inode *F2FS_INODE(const struct folio *folio)
@@ -3051,7 +3051,7 @@ static inline void f2fs_radix_tree_insert(struct radix_tree_root *root,
 
 static inline bool IS_INODE(const struct folio *folio)
 {
-       struct f2fs_node *p = F2FS_NODE(&folio->page);
+       struct f2fs_node *p = F2FS_NODE(folio);
 
        return RAW_IS_INODE(p);
 }
@@ -3075,13 +3075,13 @@ static inline unsigned int get_dnode_base(struct inode *inode,
                return 0;
 
        return inode ? get_extra_isize(inode) :
-                       offset_in_addr(&F2FS_NODE(&node_folio->page)->i);
+                       offset_in_addr(&F2FS_NODE(node_folio)->i);
 }
 
 static inline __le32 *get_dnode_addr(struct inode *inode,
                                        struct folio *node_folio)
 {
-       return blkaddr_in_node(F2FS_NODE(&node_folio->page)) +
+       return blkaddr_in_node(F2FS_NODE(node_folio)) +
                        get_dnode_base(inode, node_folio);
 }
 

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index cc9bea5b97f3abef6388caa38c7bcd96e1d78d95..154106aa350bd2cfbdad9cbc9eea75927ae99df7 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -119,7 +119,7 @@ static void __recover_inline_status(struct inode *inode, struct folio *ifolio)
 static
 bool f2fs_enable_inode_chksum(struct f2fs_sb_info *sbi, struct folio *folio)
 {
-       struct f2fs_inode *ri = &F2FS_NODE(&folio->page)->i;
+       struct f2fs_inode *ri = &F2FS_NODE(folio)->i;
 
        if (!f2fs_sb_has_inode_chksum(sbi))
                return false;
@@ -136,7 +136,7 @@ bool f2fs_enable_inode_chksum(struct f2fs_sb_info *sbi, struct folio *folio)
 
 static __u32 f2fs_inode_chksum(struct f2fs_sb_info *sbi, struct folio *folio)
 {
-       struct f2fs_node *node = F2FS_NODE(&folio->page);
+       struct f2fs_node *node = F2FS_NODE(folio);
        struct f2fs_inode *ri = &node->i;
        __le32 ino = node->footer.ino;
        __le32 gen = ri->i_generation;
@@ -173,7 +173,7 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio)
 #endif
                return true;
 
-       ri = &F2FS_NODE(&folio->page)->i;
+       ri = &F2FS_NODE(folio)->i;
        provided = le32_to_cpu(ri->i_inode_checksum);
        calculated = f2fs_inode_chksum(sbi, folio);
 
@@ -187,7 +187,7 @@ bool f2fs_inode_chksum_verify(struct f2fs_sb_info *sbi, struct folio *folio)
 
 void f2fs_inode_chksum_set(struct f2fs_sb_info *sbi, struct folio *folio)
 {
-       struct f2fs_inode *ri = &F2FS_NODE(&folio->page)->i;
+       struct f2fs_inode *ri = &F2FS_NODE(folio)->i;
 
        if (!f2fs_enable_inode_chksum(sbi, folio))
                return;

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index c22ff6203dc2c48f108019bb1ab19ccb00c7b5b2..4b3d9070e299603bd2af57a9e6b4123307a64a84 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1019,7 +1019,7 @@ static int truncate_nodes(struct dnode_of_data *dn, unsigned int nofs,
 
        f2fs_ra_node_pages(folio, ofs, NIDS_PER_BLOCK);
 
-       rn = F2FS_NODE(&folio->page);
+       rn = F2FS_NODE(folio);
        if (depth < 3) {
                for (i = ofs; i < NIDS_PER_BLOCK; i++, freed++) {
                        child_nid = le32_to_cpu(rn->in.nid[i]);
@@ -2789,7 +2789,7 @@ recover_xnid:
 
        /* 3: update and set xattr node page dirty */
        if (folio) {
-               memcpy(F2FS_NODE(&xfolio->page), F2FS_NODE(&folio->page),
+               memcpy(F2FS_NODE(xfolio), F2FS_NODE(folio),
                                VALID_XATTR_BLOCK_SIZE);
                folio_mark_dirty(xfolio);
        }
@@ -2894,7 +2894,7 @@ int f2fs_restore_node_summary(struct f2fs_sb_info *sbi,
                        if (IS_ERR(folio))
                                return PTR_ERR(folio);
 
-                       rn = F2FS_NODE(&folio->page);
+                       rn = F2FS_NODE(folio);
                        sum_entry->nid = rn->footer.nid;
                        sum_entry->version = 0;
                        sum_entry->ofs_in_node = 0;

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 70a58c4052fe49816187ed5b5b74abbc2677bd7c..030390543b54fb3f41cc22b5b2ce11416362ab4a 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -245,39 +245,39 @@ static inline void set_to_next_nat(struct f2fs_nm_info *nm_i, nid_t start_nid)
 
 static inline nid_t ino_of_node(const struct folio *node_folio)
 {
-       struct f2fs_node *rn = F2FS_NODE(&node_folio->page);
+       struct f2fs_node *rn = F2FS_NODE(node_folio);
        return le32_to_cpu(rn->footer.ino);
 }
 
 static inline nid_t nid_of_node(const struct folio *node_folio)
 {
-       struct f2fs_node *rn = F2FS_NODE(&node_folio->page);
+       struct f2fs_node *rn = F2FS_NODE(node_folio);
        return le32_to_cpu(rn->footer.nid);
 }
 
 static inline unsigned int ofs_of_node(const struct folio *node_folio)
 {
-       struct f2fs_node *rn = F2FS_NODE(&node_folio->page);
+       struct f2fs_node *rn = F2FS_NODE(node_folio);
        unsigned flag = le32_to_cpu(rn->footer.flag);
        return flag >> OFFSET_BIT_SHIFT;
 }
 
 static inline __u64 cpver_of_node(const struct folio *node_folio)
 {
-       struct f2fs_node *rn = F2FS_NODE(&node_folio->page);
+       struct f2fs_node *rn = F2FS_NODE(node_folio);
        return le64_to_cpu(rn->footer.cp_ver);
 }
 
-static inline block_t next_blkaddr_of_node(struct folio *node_folio)
+static inline block_t next_blkaddr_of_node(const struct folio *node_folio)
 {
-       struct f2fs_node *rn = F2FS_NODE(&node_folio->page);
+       struct f2fs_node *rn = F2FS_NODE(node_folio);
        return le32_to_cpu(rn->footer.next_blkaddr);
 }
 
 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(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
        unsigned int old_flag = 0;
 
        if (reset)
@@ -296,15 +296,15 @@ static inline void fill_node_footer(const struct folio *folio, nid_t nid,
 static inline void copy_node_footer(const struct folio *dst,
                const struct folio *src)
 {
-       struct f2fs_node *src_rn = F2FS_NODE(&src->page);
-       struct f2fs_node *dst_rn = F2FS_NODE(&dst->page);
+       struct f2fs_node *src_rn = F2FS_NODE(src);
+       struct f2fs_node *dst_rn = F2FS_NODE(dst);
        memcpy(&dst_rn->footer, &src_rn->footer, sizeof(struct node_footer));
 }
 
 static inline void fill_node_footer_blkaddr(struct folio *folio, block_t blkaddr)
 {
        struct f2fs_checkpoint *ckpt = F2FS_CKPT(F2FS_F_SB(folio));
-       struct f2fs_node *rn = F2FS_NODE(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
        __u64 cp_ver = cur_cp_version(ckpt);
 
        if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))
@@ -370,7 +370,7 @@ static inline bool IS_DNODE(const struct folio *node_folio)
 
 static inline int set_nid(struct folio *folio, int off, nid_t nid, bool i)
 {
-       struct f2fs_node *rn = F2FS_NODE(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
 
        f2fs_folio_wait_writeback(folio, NODE, true, true);
 
@@ -383,7 +383,7 @@ static inline int set_nid(struct folio *folio, int off, nid_t nid, bool i)
 
 static inline nid_t get_nid(const struct folio *folio, int off, bool i)
 {
-       struct f2fs_node *rn = F2FS_NODE(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
 
        if (i)
                return le32_to_cpu(rn->i.i_nid[off - NODE_DIR1_BLOCK]);
@@ -399,7 +399,7 @@ static inline nid_t get_nid(const struct folio *folio, int off, bool i)
 
 static inline int is_node(const struct folio *folio, int type)
 {
-       struct f2fs_node *rn = F2FS_NODE(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
        return le32_to_cpu(rn->footer.flag) & BIT(type);
 }
 
@@ -409,7 +409,7 @@ static inline int is_node(const struct folio *folio, int type)
 
 static inline void set_cold_node(const struct folio *folio, bool is_dir)
 {
-       struct f2fs_node *rn = F2FS_NODE(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
        unsigned int flag = le32_to_cpu(rn->footer.flag);
 
        if (is_dir)
@@ -421,7 +421,7 @@ static inline void set_cold_node(const struct folio *folio, bool is_dir)
 
 static inline void set_mark(struct folio *folio, int mark, int type)
 {
-       struct f2fs_node *rn = F2FS_NODE(&folio->page);
+       struct f2fs_node *rn = F2FS_NODE(folio);
        unsigned int flag = le32_to_cpu(rn->footer.flag);
        if (mark)
                flag |= BIT(type);