f2fs: find data segments across all the types

Previously, if type is CURSEG_HOT_DATA, we only check CURSEG_HOT_DATA only.
This patch fixes to search all the different types for SSR.

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

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index 8ba802e1bb06b2401f7e2b109e2cbeca01937919..630e7045c53e538e55b36c790e68bdcb9cd2a695 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1528,16 +1528,23 @@ static int get_ssr_segment(struct f2fs_sb_info *sbi, int type)
 {
        struct curseg_info *curseg = CURSEG_I(sbi, type);
        const struct victim_selection *v_ops = DIRTY_I(sbi)->v_ops;
+       int i;
+
+       /* need_SSR() already forces to do this */
+       if (v_ops->get_victim(sbi, &(curseg)->next_segno, BG_GC, type, SSR))
+               return 1;
 
        if (IS_NODESEG(type))
-               return v_ops->get_victim(sbi,
-                               &(curseg)->next_segno, BG_GC, type, SSR);
+               return 0;
 
        /* For data segments, let's do SSR more intensively */
-       for (; type >= CURSEG_HOT_DATA; type--)
+       for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {
+               if (i == type)
+                       continue;
                if (v_ops->get_victim(sbi, &(curseg)->next_segno,
-                                               BG_GC, type, SSR))
+                                               BG_GC, i, SSR))
                        return 1;
+       }
        return 0;
 }