diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index ab708374d88e2761633f218ee4e6683ae78e0610..0b355f00225bf9df4fe090fa074654e6fd3824ae 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -2296,12 +2296,17 @@ static int f2fs_ioc_shutdown(struct file *filp, unsigned long arg)
 		goto out;
 	}
 
+	/* grab sb->s_umount to avoid racing w/ remount() */
+	down_read(&sbi->sb->s_umount);
+
 	f2fs_stop_gc_thread(sbi);
 	f2fs_stop_discard_thread(sbi);
 
 	f2fs_drop_discard_cmd(sbi);
 	clear_opt(sbi, DISCARD);
 
+	up_read(&sbi->sb->s_umount);
+
 	f2fs_update_time(sbi, REQ_TIME);
 out:
 	if (in != F2FS_GOING_DOWN_FULLSYNC)