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

Commit c7fab1f5 authored by Anand Jain's avatar Anand Jain Committed by Greg Kroah-Hartman
Browse files

btrfs: fix upper limit for max_inline for page size 64K 



commit 6f93e834fa7c5faa0372e46828b4b2a966ac61d7 upstream.

The mount option max_inline ranges from 0 to the sectorsize (which is
now equal to page size). But we parse the mount options too early and
before the actual sectorsize is read from the superblock. So the upper
limit of max_inline is unaware of the actual sectorsize and is limited
by the temporary sectorsize 4096, even on a system where the default
sectorsize is 64K.

Fix this by reading the superblock sectorsize before the mount option
parse.

Reported-by: default avatarAlexander Tsvetkov <alexander.tsvetkov@oracle.com>
CC: stable@vger.kernel.org # 5.4+
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b9cc70e3

fs/btrfs/disk-io.c

+23 −22
Original line number Original line Diff line number Diff line
@@ -2894,6 +2894,29 @@ int open_ctree(struct super_block *sb, 
	 */

	 */

	fs_info->compress_type = BTRFS_COMPRESS_ZLIB;

	fs_info->compress_type = BTRFS_COMPRESS_ZLIB;





	/*

	 * Flag our filesystem as having big metadata blocks if they are bigger

	 * than the page size

	 */

	if (btrfs_super_nodesize(disk_super) > PAGE_SIZE) {

		if (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA))

			btrfs_info(fs_info,

				"flagging fs with big metadata feature");

		features |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA;

	}



	/* Set up fs_info before parsing mount options */

	nodesize = btrfs_super_nodesize(disk_super);

	sectorsize = btrfs_super_sectorsize(disk_super);

	stripesize = sectorsize;

	fs_info->dirty_metadata_batch = nodesize * (1 + ilog2(nr_cpu_ids));

	fs_info->delalloc_batch = sectorsize * 512 * (1 + ilog2(nr_cpu_ids));



	/* Cache block sizes */

	fs_info->nodesize = nodesize;

	fs_info->sectorsize = sectorsize;

	fs_info->stripesize = stripesize;



	ret = btrfs_parse_options(fs_info, options, sb->s_flags);

	ret = btrfs_parse_options(fs_info, options, sb->s_flags);

	if (ret) {

	if (ret) {

		err = ret;

		err = ret;
@@ -2920,28 +2943,6 @@ int open_ctree(struct super_block *sb, 
	if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)

	if (features & BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA)

		btrfs_info(fs_info, "has skinny extents");

		btrfs_info(fs_info, "has skinny extents");





	/*

	 * flag our filesystem as having big metadata blocks if

	 * they are bigger than the page size

	 */

	if (btrfs_super_nodesize(disk_super) > PAGE_SIZE) {

		if (!(features & BTRFS_FEATURE_INCOMPAT_BIG_METADATA))

			btrfs_info(fs_info,

				"flagging fs with big metadata feature");

		features |= BTRFS_FEATURE_INCOMPAT_BIG_METADATA;

	}



	nodesize = btrfs_super_nodesize(disk_super);

	sectorsize = btrfs_super_sectorsize(disk_super);

	stripesize = sectorsize;

	fs_info->dirty_metadata_batch = nodesize * (1 + ilog2(nr_cpu_ids));

	fs_info->delalloc_batch = sectorsize * 512 * (1 + ilog2(nr_cpu_ids));



	/* Cache block sizes */

	fs_info->nodesize = nodesize;

	fs_info->sectorsize = sectorsize;

	fs_info->stripesize = stripesize;



	/*

	/*

	 * mixed block groups end up with duplicate but slightly offset

	 * mixed block groups end up with duplicate but slightly offset

	 * extent buffers for the same range.  It leads to corruptions

	 * extent buffers for the same range.  It leads to corruptions