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>

4 files changed, 4 insertions, 6 deletions

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 3644db9177cb..9a0d103b5052 100644
--- 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 4efc815129b1..401f09ccce7e 100644
--- 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 177c438e4a56..b86e2b15b619 100644
--- 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))
@@ -2291,6 +2291,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 081ef0d672bf..e593b4d78be2 100644
--- 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);