lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 786/862] btrfs: dont print information about space cache or tree every remount
    Date
    From: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>

    [ Upstream commit dbecac26630014d336a8e5ea67096ff18210fb9c ]

    btrfs currently prints information about space cache or free space tree
    being in use on every remount, regardless whether such remount actually
    enabled or disabled one of these features.

    This is actually unnecessary since providing remount options changing the
    state of these features will explicitly print the appropriate notice.

    Let's instead print such unconditional information just on an initial mount
    to avoid filling the kernel log when, for example, laptop-mode-tools
    remount the fs on some events.

    Signed-off-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>
    Reviewed-by: David Sterba <dsterba@suse.com>
    Signed-off-by: David Sterba <dsterba@suse.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    fs/btrfs/super.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
    index 6eeb3402b4a2..ad3ce9700eaf 100644
    --- a/fs/btrfs/super.c
    +++ b/fs/btrfs/super.c
    @@ -626,6 +626,7 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
    int saved_compress_level;
    bool saved_compress_force;
    int no_compress = 0;
    + const bool remounting = test_bit(BTRFS_FS_STATE_REMOUNTING, &info->fs_state);

    if (btrfs_fs_compat_ro(info, FREE_SPACE_TREE))
    btrfs_set_opt(info->mount_opt, FREE_SPACE_TREE);
    @@ -1137,10 +1138,12 @@ int btrfs_parse_options(struct btrfs_fs_info *info, char *options,
    }
    if (!ret)
    ret = btrfs_check_mountopts_zoned(info);
    - if (!ret && btrfs_test_opt(info, SPACE_CACHE))
    - btrfs_info(info, "disk space caching is enabled");
    - if (!ret && btrfs_test_opt(info, FREE_SPACE_TREE))
    - btrfs_info(info, "using free space tree");
    + if (!ret && !remounting) {
    + if (btrfs_test_opt(info, SPACE_CACHE))
    + btrfs_info(info, "disk space caching is enabled");
    + if (btrfs_test_opt(info, FREE_SPACE_TREE))
    + btrfs_info(info, "using free space tree");
    + }
    return ret;
    }

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 12:43    [W:4.103 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site