xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'for-4.20-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

Browse Source 
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
This commit is contained in:
Linus Torvalds
2018-12-05 09:58:17 -08:00
parent 91dd51f6e7 10950929e9
commit d089709045
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
fs/btrfs/tree-checker.c
View File

@@ -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 * 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 * handle it. We care more about the size.
* larger than maximum size, it's must be some obvious corruption.
*/ */
if (key->offset > BTRFS_MAX_DATA_CHUNK_SIZE || key->offset == 0) { if (key->offset == 0) {
block_group_err(fs_info, leaf, slot, block_group_err(fs_info, leaf, slot,
"invalid block group size, have %llu expect (0, %llu]", "invalid block group size 0");
key->offset, BTRFS_MAX_DATA_CHUNK_SIZE);
return -EUCLEAN; return -EUCLEAN;
} }