2 files changed, 1 insertions, 3 deletions

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index b197a2f2993a..657683c9ee48 100644
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -96,8 +96,6 @@ int start_gc_thread(struct f2fs_sb_info *sbi)
         dev_t dev = sbi->sb->s_bdev->bd_dev;
         int err = 0;
 
-        if (!test_opt(sbi, BG_GC))
-                goto out;
         gc_th = kmalloc(sizeof(struct f2fs_gc_kthread), GFP_KERNEL);
         if (!gc_th) {
                 err = -ENOMEM;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 512ffd8e1624..536d41401748 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1138,7 +1138,7 @@ try_onemore:
          * If filesystem is not mounted as read-only then
          * do start the gc_thread.
          */
-        if (!f2fs_readonly(sb)) {
+        if (test_opt(sbi, BG_GC) && !f2fs_readonly(sb)) {
                 /* After POR, we can run background GC thread.*/
                 err = start_gc_thread(sbi);
                 if (err)