f2fs: fix the missing write pointer correction

commit 201e07aec617b10360df09090651dea9d0d4f7d3 upstream.

If checkpoint was disabled, we missed to fix the write pointers.

Cc: <stable@vger.kernel.org>
Fixes: 1015035609e4 ("f2fs: fix changing cursegs if recovery fails on zoned device")
Reviewed-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index fc7d463dee158ac6aeb7d101492b56e0045636cc..2ee5a928c32f4dadded4c7789f94c79b858dafad 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -4729,8 +4729,10 @@ try_onemore:
        if (err)
                goto free_meta;
 
-       if (unlikely(is_set_ckpt_flags(sbi, CP_DISABLED_FLAG)))
+       if (unlikely(is_set_ckpt_flags(sbi, CP_DISABLED_FLAG))) {
+               skip_recovery = true;
                goto reset_checkpoint;
+       }
 
        /* recover fsynced data */
        if (!test_opt(sbi, DISABLE_ROLL_FORWARD) &&