Commit 7467bc59 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David Sterba
Browse files

btrfs: zoned: calculate max_extent_size properly on non-zoned setup 



Since commit 559218d4 ("block: pre-calculate max_zone_append_sectors"),
queue_limits's max_zone_append_sectors is default to be 0 and it is only
updated when there is a zoned device. So, we have
lim->max_zone_append_sectors = 0 when there is no zoned device in the
filesystem.

That leads to fs_info->max_zone_append_size and thus
fs_info->max_extent_size to be 0, which is wrong and can for example
lead to a divide by zero in count_max_extents().

Fix this by only capping fs_info->max_extent_size to
fs_info->max_zone_append_size when it is non-zero.

Based on a patch from Naohiro Aota <naohiro.aota@wdc.com>, from which
much of this commit message is stolen as well.

Reported-by: default avatarShinichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Fixes: 559218d4 ("block: pre-calculate max_zone_append_sectors")
Tested-by: default avatarShinichiro Kawasaki <shinichiro.kawasaki@wdc.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6aecd91a

fs/btrfs/zoned.c

+3 −2
Original line number Diff line number Diff line
@@ -745,8 +745,9 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info) 
		     (u64)lim->max_segments << PAGE_SHIFT),

		fs_info->sectorsize);

	fs_info->fs_devices->chunk_alloc_policy = BTRFS_CHUNK_ALLOC_ZONED;

	if (fs_info->max_zone_append_size < fs_info->max_extent_size)

		fs_info->max_extent_size = fs_info->max_zone_append_size;



	fs_info->max_extent_size = min_not_zero(fs_info->max_extent_size,

						fs_info->max_zone_append_size);



	/*

	 * Check mount options here, because we might change fs_info->zoned