lkml.org 
[lkml]   [2021]   [Nov]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 089/279] f2fs: fix incorrect return value in f2fs_sanity_check_ckpt()
    Date
    From: Chao Yu <chao@kernel.org>

    [ Upstream commit ca98d72141dd81f42893a9a43d7ededab3355fba ]

    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: 65ddf6564843 ("f2fs: fix to do sanity check for sb/cp fields correctly")
    Reported-by: Pavel Machek <pavel@denx.de>
    Reviewed-by: Pavel Machek <pavel@denx.de>
    Signed-off-by: Chao Yu <chao@kernel.org>
    Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/f2fs/super.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
    index 4d24146b4f471..8795a5a8d4e89 100644
    --- a/fs/f2fs/super.c
    +++ b/fs/f2fs/super.c
    @@ -3487,7 +3487,7 @@ skip_cross:
    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))) {
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-24 14:54    [W:4.031 / U:0.084 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site