Commit ca98d721 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix incorrect return value in f2fs_sanity_check_ckpt() 

As Pavel Machek reported in [1]

This code looks quite confused: part of function returns 1 on
corruption, part returns -errno. The problem is not stable-specific.

[1] https://lkml.org/lkml/2021/9/19/207



Let's fix to make 'insane cp_payload case' to return 1 rater than
EFSCORRUPTED, so that return value can be kept consistent for all
error cases, it can avoid confusion of code logic.

Fixes: 65ddf656 ("f2fs: fix to do sanity check for sb/cp fields correctly")
Reported-by: default avatarPavel Machek <pavel@denx.de>
Reviewed-by: default avatarPavel Machek <pavel@denx.de>
Signed-off-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 02d58cd2

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -3495,7 +3495,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sb_info *sbi) 
		NR_CURSEG_PERSIST_TYPE + nat_bits_blocks >= blocks_per_seg)) {

		f2fs_warn(sbi, "Insane cp_payload: %u, nat_bits_blocks: %u)",

			  cp_payload, nat_bits_blocks);

		return -EFSCORRUPTED;

		return 1;

	}



	if (unlikely(f2fs_cp_error(sbi))) {