diff --git a/[refs] b/[refs] index cc4589e6f21e..3d1b0c268345 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94787d91cba7ba168b028703b50a0224702ace9c +refs/heads/master: 48600e44c18e4eb0f7c02ec8633c4c56aef292f0 diff --git a/trunk/fs/f2fs/gc.c b/trunk/fs/f2fs/gc.c index 375e69e2c6f1..8d293cb685ba 100644 --- a/trunk/fs/f2fs/gc.c +++ b/trunk/fs/f2fs/gc.c @@ -49,11 +49,6 @@ static int gc_thread_func(void *data) continue; } - f2fs_balance_fs(sbi); - - if (!test_opt(sbi, BG_GC)) - continue; - /* * [GC triggering condition] * 0. GC is not conducted currently. @@ -96,6 +91,8 @@ int start_gc_thread(struct f2fs_sb_info *sbi) { struct f2fs_gc_kthread *gc_th; + if (!test_opt(sbi, BG_GC)) + return 0; gc_th = kmalloc(sizeof(struct f2fs_gc_kthread), GFP_KERNEL); if (!gc_th) return -ENOMEM;