diff options
author | 2018-12-05 09:58:17 -0800 | |
---|---|---|
committer | 2018-12-05 09:58:17 -0800 | |
commit | d0897090458211f9c6b2d7f5af87f4d3b0403f69 (patch) | |
tree | c965e3ecc022bef7e77ae192351b83909ef9e7b6 | |
parent | Merge tag 'pm-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafa... (diff) | |
parent | btrfs: tree-checker: Don't check max block group size as current max chunk si... (diff) | |
download | linux-d0897090458211f9c6b2d7f5af87f4d3b0403f69.tar.gz linux-d0897090458211f9c6b2d7f5af87f4d3b0403f69.tar.bz2 linux-d0897090458211f9c6b2d7f5af87f4d3b0403f69.zip |
Merge tag 'for-4.20-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull btrfs fix from David Sterba:
"A patch in 4.19 introduced a sanity check that was too strict and a
filesystem cannot be mounted.
This happens for filesystems with more than 10 devices and has been
reported by a few users so we need the fix to propagate to stable"
* tag 'for-4.20-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
btrfs: tree-checker: Don't check max block group size as current max chunk size limit is unreliable
-rw-r--r-- | fs/btrfs/tree-checker.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index efcf89a8ba44..1a4e2b101ef2 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c @@ -389,13 +389,11 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info, /* * Here we don't really care about alignment since extent allocator can - * handle it. We care more about the size, as if one block group is - * larger than maximum size, it's must be some obvious corruption. + * handle it. We care more about the size. */ - if (key->offset > BTRFS_MAX_DATA_CHUNK_SIZE || key->offset == 0) { + if (key->offset == 0) { block_group_err(fs_info, leaf, slot, - "invalid block group size, have %llu expect (0, %llu]", - key->offset, BTRFS_MAX_DATA_CHUNK_SIZE); + "invalid block group size 0"); return -EUCLEAN; } |