From: Chengguang Xu via Linux-f2fs-devel Date: Fri, 27 Sep 2019 01:35:48 +0000 (+0800) Subject: f2fs: mark recovery flag correctly in read_raw_super_block() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=ed3520427f57327f581de0cc28c1c30df08f0103;p=linux.git f2fs: mark recovery flag correctly in read_raw_super_block() On the combination of first fail and second success, we will miss to mark recovery flag because currently we reuse err variable in the loop. Signed-off-by: Chengguang Xu Reviewed-by: Chao Yu Signed-off-by: Jaegeuk Kim --- diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1443cee158633..f3a68af3b43ac 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -2951,6 +2951,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi, f2fs_err(sbi, "Unable to read %dth superblock", block + 1); err = -EIO; + *recovery = 1; continue; } @@ -2960,6 +2961,7 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi, f2fs_err(sbi, "Can't find valid F2FS filesystem in %dth superblock", block + 1); brelse(bh); + *recovery = 1; continue; } @@ -2972,10 +2974,6 @@ static int read_raw_super_block(struct f2fs_sb_info *sbi, brelse(bh); } - /* Fail to read any one of the superblocks*/ - if (err < 0) - *recovery = 1; - /* No valid superblock */ if (!*raw_super) kvfree(super);