lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 1016/1095] btrfs: properly flag filesystem with BTRFS_FEATURE_INCOMPAT_BIG_METADATA
    Date
    From: Nikolay Borisov <nborisov@suse.com>

    [ Upstream commit e26b04c4c91925dba57324db177a24e18e2d0013 ]

    Commit 6f93e834fa7c seemingly inadvertently moved the code responsible
    for flagging the filesystem as having BIG_METADATA to a place where
    setting the flag was essentially lost. This means that
    filesystems created with kernels containing this bug (starting with 5.15)
    can potentially be mounted by older (pre-3.4) kernels. In reality
    chances for this happening are low because there are other incompat
    flags introduced in the mean time. Still the correct behavior is to set
    INCOMPAT_BIG_METADATA flag and persist this in the superblock.

    Fixes: 6f93e834fa7c ("btrfs: fix upper limit for max_inline for page size 64K")
    CC: stable@vger.kernel.org # 5.4+
    Reviewed-by: Qu Wenruo <wqu@suse.com>
    Signed-off-by: Nikolay Borisov <nborisov@suse.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/disk-io.c | 21 +++++++++++----------
    1 file changed, 11 insertions(+), 10 deletions(-)

    diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
    index f45470798022..34cd57d799e4 100644
    --- a/fs/btrfs/disk-io.c
    +++ b/fs/btrfs/disk-io.c
    @@ -3577,16 +3577,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
    */
    fs_info->compress_type = BTRFS_COMPRESS_ZLIB;

    - /*
    - * Flag our filesystem as having big metadata blocks if they are bigger
    - * than the page size.
    - */
    - if (btrfs_super_nodesize(disk_super) > PAGE_SIZE) {
    - if (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA))
    - btrfs_info(fs_info,
    - "flagging fs with big metadata feature");
    - features |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA;
    - }

    /* Set up fs_info before parsing mount options */
    nodesize = btrfs_super_nodesize(disk_super);
    @@ -3627,6 +3617,17 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device
    if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)
    btrfs_info(fs_info, "has skinny extents");

    + /*
    + * Flag our filesystem as having big metadata blocks if they are bigger
    + * than the page size.
    + */
    + if (btrfs_super_nodesize(disk_super) > PAGE_SIZE) {
    + if (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA))
    + btrfs_info(fs_info,
    + "flagging fs with big metadata feature");
    + features |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA;
    + }
    +
    /*
    * mixed block groups end up with duplicate but slightly offset
    * extent buffers for the same range. It leads to corruptions
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-16 01:25    [W:4.259 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site