Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0897090 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 91dd51f6 10950929

fs/btrfs/tree-checker.c

+3 −5
Original line number Diff line number Diff line
@@ -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;

	}