f2fs: Pass a folio to set_cold_node()

All callers have a folio so pass it in.  Also mark it as const to help
the compiler.

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/inode.c b/fs/f2fs/inode.c
index 05850cb0029942b0ddec9d5d5d3ef6a126b84c56..251526c73930503cd4d2322a2cc9e497b051e17a 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -484,7 +484,7 @@ static int do_read_inode(struct inode *inode)
        /* try to recover cold bit for non-dir inode */
        if (!S_ISDIR(inode->i_mode) && !is_cold_node(&node_folio->page)) {
                f2fs_folio_wait_writeback(node_folio, NODE, true, true);
-               set_cold_node(&node_folio->page, false);
+               set_cold_node(node_folio, false);
                folio_mark_dirty(node_folio);
        }
 

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 9657b9f2ecdf5c2ce5e00171c90b1f86b628d40e..b410f2d125f3e429f93cf2ea738e54b43a85c6b8 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1381,7 +1381,7 @@ struct folio *f2fs_new_node_folio(struct dnode_of_data *dn, unsigned int ofs)
 
        f2fs_folio_wait_writeback(folio, NODE, true, true);
        fill_node_footer(&folio->page, dn->nid, dn->inode->i_ino, ofs, true);
-       set_cold_node(&folio->page, S_ISDIR(dn->inode->i_mode));
+       set_cold_node(folio, S_ISDIR(dn->inode->i_mode));
        if (!folio_test_uptodate(folio))
                folio_mark_uptodate(folio);
        if (folio_mark_dirty(folio))
@@ -2828,7 +2828,7 @@ retry:
        if (!folio_test_uptodate(ifolio))
                folio_mark_uptodate(ifolio);
        fill_node_footer(&ifolio->page, ino, ino, 0, true);
-       set_cold_node(&ifolio->page, false);
+       set_cold_node(ifolio, false);
 
        src = F2FS_INODE(folio);
        dst = F2FS_INODE(ifolio);

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 5bcda63fa74867ad71c9a4a8263a509b919295bc..43137b5fcbf41d622334bb51636d2a583b9dee7b 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -406,9 +406,9 @@ static inline int is_node(const struct page *page, int type)
 #define is_fsync_dnode(page)   is_node(page, FSYNC_BIT_SHIFT)
 #define is_dent_dnode(page)    is_node(page, DENT_BIT_SHIFT)
 
-static inline void set_cold_node(struct page *page, bool is_dir)
+static inline void set_cold_node(const struct folio *folio, bool is_dir)
 {
-       struct f2fs_node *rn = F2FS_NODE(page);
+       struct f2fs_node *rn = F2FS_NODE(&folio->page);
        unsigned int flag = le32_to_cpu(rn->footer.flag);
 
        if (is_dir)