Commit 94f54924 authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

btrfs: zoned: fix conventional zone capacity calculation 



When a block group contains both conventional zone and sequential zone, the
capacity of the block group is wrongly set to the block group's full
length. The capacity should be calculated in btrfs_load_block_group_* using
the last allocation offset.

Fixes: 568220fa ("btrfs: zoned: support RAID0/1/10 on top of raid stripe tree")
CC: stable@vger.kernel.org # v6.12+
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 3b1a4a59

fs/btrfs/zoned.c

+2 −2
Original line number Diff line number Diff line
@@ -1317,6 +1317,7 @@ static int btrfs_load_zone_info(struct btrfs_fs_info *fs_info, int zone_idx, 
	if (!btrfs_dev_is_sequential(device, info->physical)) {

		up_read(&dev_replace->rwsem);

		info->alloc_offset = WP_CONVENTIONAL;

		info->capacity = device->zone_info->zone_size;

		return 0;

	}
@@ -1683,8 +1684,6 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new) 
		set_bit(BLOCK_GROUP_FLAG_SEQUENTIAL_ZONE, &cache->runtime_flags);



	if (num_conventional > 0) {

		/* Zone capacity is always zone size in emulation */

		cache->zone_capacity = cache->length;

		ret = calculate_alloc_pointer(cache, &last_alloc, new);

		if (ret) {

			btrfs_err(fs_info,
@@ -1693,6 +1692,7 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new) 
			goto out;

		} else if (map->num_stripes == num_conventional) {

			cache->alloc_offset = last_alloc;

			cache->zone_capacity = cache->length;

			set_bit(BLOCK_GROUP_FLAG_ZONE_IS_ACTIVE, &cache->runtime_flags);

			goto out;

		}