Commit 0d703963 authored by Naohiro Aota's avatar Naohiro Aota Committed by David Sterba
Browse files

btrfs: zoned: refine extent allocator hint selection 



The hint block group selection in the extent allocator is wrong in the
first place, as it can select the dedicated data relocation block group for
the normal data allocation.

Since we separated the normal data space_info and the data relocation
space_info, we can easily identify a block group is for data relocation or
not. Do not choose it for the normal data allocation.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNaohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent f07b855c

fs/btrfs/extent-tree.c

+4 −2
Original line number Diff line number Diff line
@@ -4297,7 +4297,8 @@ static int prepare_allocation_clustered(struct btrfs_fs_info *fs_info, 
}



static int prepare_allocation_zoned(struct btrfs_fs_info *fs_info,

				    struct find_free_extent_ctl *ffe_ctl)

				    struct find_free_extent_ctl *ffe_ctl,

				    struct btrfs_space_info *space_info)

{

	if (ffe_ctl->for_treelog) {

		spin_lock(&fs_info->treelog_bg_lock);
@@ -4321,6 +4322,7 @@ static int prepare_allocation_zoned(struct btrfs_fs_info *fs_info, 
			u64 avail = block_group->zone_capacity - block_group->alloc_offset;



			if (block_group_bits(block_group, ffe_ctl->flags) &&

			    block_group->space_info == space_info &&

			    avail >= ffe_ctl->num_bytes) {

				ffe_ctl->hint_byte = block_group->start;

				break;
@@ -4342,7 +4344,7 @@ static int prepare_allocation(struct btrfs_fs_info *fs_info, 
		return prepare_allocation_clustered(fs_info, ffe_ctl,

						    space_info, ins);

	case BTRFS_EXTENT_ALLOC_ZONED:

		return prepare_allocation_zoned(fs_info, ffe_ctl);

		return prepare_allocation_zoned(fs_info, ffe_ctl, space_info);

	default:

		BUG();

	}