3 files changed, 9 insertions, 2 deletions

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index eb89037e3312..2f157e883687 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -153,12 +153,18 @@ static void select_policy(struct f2fs_sb_info *sbi, int gc_type,
         if (p->alloc_mode == SSR) {
                 p->gc_mode = GC_GREEDY;
                 p->dirty_segmap = dirty_i->dirty_segmap[type];
+                p->max_search = dirty_i->nr_dirty[type];
                 p->ofs_unit = 1;
         } else {
                 p->gc_mode = select_gc_type(sbi->gc_thread, gc_type);
                 p->dirty_segmap = dirty_i->dirty_segmap[DIRTY];
+                p->max_search = dirty_i->nr_dirty[DIRTY];
                 p->ofs_unit = sbi->segs_per_sec;
         }
+
+        if (p->max_search > MAX_VICTIM_SEARCH)
+                p->max_search = MAX_VICTIM_SEARCH;
+
         p->offset = sbi->last_victim[p->gc_mode];
 }
 
@@ -305,7 +311,7 @@ static int get_victim_by_default(struct f2fs_sb_info *sbi,
                 if (cost == max_cost)
                         continue;
 
-                if (nsearched++ >= MAX_VICTIM_SEARCH) {
+                if (nsearched++ >= p.max_search) {
                         sbi->last_victim[p.gc_mode] = segno;
                         break;
                 }
diff --git a/fs/f2fs/gc.h b/fs/f2fs/gc.h
index c22dee9f1422..507056d22205 100644
--- a/fs/f2fs/gc.h
+++ b/fs/f2fs/gc.h
@@ -20,7 +20,7 @@
 #define LIMIT_FREE_BLOCK        40 /* percentage over invalid + free space */
 
 /* Search max. number of dirty segments to select a victim segment */
-#define MAX_VICTIM_SEARCH       20
+#define MAX_VICTIM_SEARCH 4096 /* covers 8GB */
 
 struct f2fs_gc_kthread {
         struct task_struct *f2fs_gc_task;
diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h
index e0d6d3abf396..bdd10eab8c40 100644
--- a/fs/f2fs/segment.h
+++ b/fs/f2fs/segment.h
@@ -142,6 +142,7 @@ struct victim_sel_policy {
         int alloc_mode;                 /* LFS or SSR */
         int gc_mode;                    /* GC_CB or GC_GREEDY */
         unsigned long *dirty_segmap;    /* dirty segment bitmap */
+        unsigned int max_search;        /* maximum # of segments to search */
         unsigned int offset;            /* last scanned bitmap offset */
         unsigned int ofs_unit;          /* bitmap search unit */
         unsigned int min_cost;          /* minimum cost */