f2fs: disable roll-forward when active_logs = 2

The roll-forward mechanism should be activated when the number of active
logs is not 2.

Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 46311e7b388a..54722a0a5be5 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -132,6 +132,8 @@ static inline bool need_do_checkpoint(struct inode *inode)
                 need_cp = true;
         else if (test_opt(sbi, FASTBOOT))
                 need_cp = true;
+        else if (sbi->active_logs == 2)
+                need_cp = true;
 
         return need_cp;
 }
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 2fb3d7f71c4e..16721b5dffa4 100644
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1090,8 +1090,8 @@ static int __get_segment_type_4(struct page *page, enum page_type p_type)
                 else
                         return CURSEG_COLD_DATA;
         } else {
-                if (IS_DNODE(page) && !is_cold_node(page))
-                        return CURSEG_HOT_NODE;
+                if (IS_DNODE(page) && is_cold_node(page))
+                        return CURSEG_WARM_NODE;
                 else
                         return CURSEG_COLD_NODE;
         }