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

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

Pull btrfs fix from David Sterba:
 "A regression fix caused by a refactoring in 5.11.

  A corrupted superblock wouldn't be detected by checksum verification
  due to wrongly placed initialization of the checksum length, thus
  making memcmp always work"

* tag 'for-5.11-rc7-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
  btrfs: initialize fs_info::csum_size earlier in open_ctree
parents 7989807d 83c68bbc

fs/btrfs/disk-io.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3044,6 +3044,8 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
		goto fail_alloc;

		goto fail_alloc;

	}

	}





	fs_info->csum_size = btrfs_super_csum_size(disk_super);



	ret = btrfs_init_csum_hash(fs_info, csum_type);

	ret = btrfs_init_csum_hash(fs_info, csum_type);

	if (ret) {

	if (ret) {

		err = ret;

		err = ret;
@@ -3161,7 +3163,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device 
	fs_info->nodesize = nodesize;

	fs_info->nodesize = nodesize;

	fs_info->sectorsize = sectorsize;

	fs_info->sectorsize = sectorsize;

	fs_info->sectorsize_bits = ilog2(sectorsize);

	fs_info->sectorsize_bits = ilog2(sectorsize);

	fs_info->csum_size = btrfs_super_csum_size(disk_super);

	fs_info->csums_per_leaf = BTRFS_MAX_ITEM_SIZE(fs_info) / fs_info->csum_size;

	fs_info->csums_per_leaf = BTRFS_MAX_ITEM_SIZE(fs_info) / fs_info->csum_size;

	fs_info->stripesize = stripesize;

	fs_info->stripesize = stripesize;