lkml.org 
[lkml]   [2021]   [Sep]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 081/380] f2fs: fix wrong checkpoint_changed value in f2fs_remount()
    Date
    From: Chao Yu <chao@kernel.org>

    [ Upstream commit 277afbde6ca2b38729683fc17c031b4bc942068d ]

    In f2fs_remount(), return value of test_opt() is an unsigned int type
    variable, however when we compare it to a bool type variable, it cause
    wrong result, fix it.

    Fixes: 4354994f097d ("f2fs: checkpoint disabling")
    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 | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
    index 97e3efe5a020..d61f7fcdc66b 100644
    --- a/fs/f2fs/super.c
    +++ b/fs/f2fs/super.c
    @@ -1966,11 +1966,10 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
    bool need_restart_ckpt = false, need_stop_ckpt = false;
    bool need_restart_flush = false, need_stop_flush = false;
    bool no_extent_cache = !test_opt(sbi, EXTENT_CACHE);
    - bool disable_checkpoint = test_opt(sbi, DISABLE_CHECKPOINT);
    + bool enable_checkpoint = !test_opt(sbi, DISABLE_CHECKPOINT);
    bool no_io_align = !F2FS_IO_ALIGNED(sbi);
    bool no_atgc = !test_opt(sbi, ATGC);
    bool no_compress_cache = !test_opt(sbi, COMPRESS_CACHE);
    - bool checkpoint_changed;
    #ifdef CONFIG_QUOTA
    int i, j;
    #endif
    @@ -2015,8 +2014,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
    err = parse_options(sb, data, true);
    if (err)
    goto restore_opts;
    - checkpoint_changed =
    - disable_checkpoint != test_opt(sbi, DISABLE_CHECKPOINT);

    /*
    * Previous and new state of filesystem is RO,
    @@ -2133,7 +2130,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)
    need_stop_flush = true;
    }

    - if (checkpoint_changed) {
    + if (enable_checkpoint == !!test_opt(sbi, DISABLE_CHECKPOINT)) {
    if (test_opt(sbi, DISABLE_CHECKPOINT)) {
    err = f2fs_disable_checkpoint(sbi);
    if (err)
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-16 19:07    [W:2.337 / U:0.264 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site