f2fs: remove unneeded set_cold_node()

When setting COLD_BIT_SHIFT flag in node block, we only need to call
set_cold_node() in new_node_page() and recover_inode_page() during
node page initialization. So remove unneeded set_cold_node() in other
places.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 3644db9177cb4fcd75e9b9b4d1dec73b3fc18f97..9a0d103b5052dc1e024813568734545071e24f10 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -396,8 +396,6 @@ struct page *init_inode_metadata(struct inode *inode, struct inode *dir,
                page = get_node_page(F2FS_I_SB(dir), inode->i_ino);
                if (IS_ERR(page))
                        return page;
-
-               set_cold_node(inode, page);
        }
 
        if (new_name) {

diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c
index 4efc815129b12b0a4b6fe91bb0dff42ffe4edaca..401f09ccce7ef54ead4361fcd07226b7574ca572 100644 (file)
--- a/fs/f2fs/inode.c
+++ b/fs/f2fs/inode.c
@@ -439,7 +439,6 @@ void update_inode(struct inode *inode, struct page *node_page)
        }
 
        __set_inode_rdev(inode, ri);
-       set_cold_node(inode, node_page);
 
        /* deleted inode */
        if (inode->i_nlink == 0)

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 7cded843cf1833c82de053b8e9ef240d8a39c3ab..5ed28628d790082234ebce0f9e393de2a65107c6 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1076,7 +1076,7 @@ struct page *new_node_page(struct dnode_of_data *dn, unsigned int ofs)
 
        f2fs_wait_on_page_writeback(page, NODE, true);
        fill_node_footer(page, dn->nid, dn->inode->i_ino, ofs, true);
-       set_cold_node(dn->inode, page);
+       set_cold_node(page, S_ISDIR(dn->inode->i_mode));
        if (!PageUptodate(page))
                SetPageUptodate(page);
        if (set_page_dirty(page))
@@ -2310,6 +2310,7 @@ retry:
        if (!PageUptodate(ipage))
                SetPageUptodate(ipage);
        fill_node_footer(ipage, ino, ino, 0, true);
+       set_cold_node(page, false);
 
        src = F2FS_INODE(page);
        dst = F2FS_INODE(ipage);

diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h
index 081ef0d672bf5cf457a3bb1f4c20328bf24b1a12..e593b4d78be22851a154803c911b57587bd89e7b 100644 (file)
--- a/fs/f2fs/node.h
+++ b/fs/f2fs/node.h
@@ -422,12 +422,12 @@ static inline void clear_inline_node(struct page *page)
        ClearPageChecked(page);
 }
 
-static inline void set_cold_node(struct inode *inode, struct page *page)
+static inline void set_cold_node(struct page *page, bool is_dir)
 {
        struct f2fs_node *rn = F2FS_NODE(page);
        unsigned int flag = le32_to_cpu(rn->footer.flag);
 
-       if (S_ISDIR(inode->i_mode))
+       if (is_dir)
                flag &= ~(0x1 << COLD_BIT_SHIFT);
        else
                flag |= (0x1 << COLD_BIT_SHIFT);