Skip to content

Commit d089709

Browse files
committed
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
2 parents 91dd51f + 1095092 commit d089709

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

fs/btrfs/tree-checker.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -389,13 +389,11 @@ static int check_block_group_item(struct btrfs_fs_info *fs_info,
389389

390390
/*
391391
* Here we don't really care about alignment since extent allocator can
392-
* handle it. We care more about the size, as if one block group is
393-
* larger than maximum size, it's must be some obvious corruption.
392+
* handle it. We care more about the size.
394393
*/
395-
if (key->offset > BTRFS_MAX_DATA_CHUNK_SIZE || key->offset == 0) {
394+
if (key->offset == 0) {
396395
block_group_err(fs_info, leaf, slot,
397-
"invalid block group size, have %llu expect (0, %llu]",
398-
key->offset, BTRFS_MAX_DATA_CHUNK_SIZE);
396+
"invalid block group size 0");
399397
return -EUCLEAN;
400398
}
401399

0 commit comments

Comments
 (0)