diff options
author | Naohiro Aota <naohiro.aota@wdc.com> | 2022-05-03 14:10:04 -0700 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2022-05-05 21:05:56 +0200 |
commit | 549577127afeb759c29cdeeff1bdccd86e6c0dbf (patch) | |
tree | 68327ecbe3d8e78ddcbbb5c2305992a94c78defa /fs/btrfs | |
parent | 9f73f1aef98b2fa7252c0a89be64840271ce8ea0 (diff) | |
download | linux-stable-549577127afeb759c29cdeeff1bdccd86e6c0dbf.tar.gz linux-stable-549577127afeb759c29cdeeff1bdccd86e6c0dbf.tar.bz2 linux-stable-549577127afeb759c29cdeeff1bdccd86e6c0dbf.zip |
btrfs: zoned: move non-changing condition check out of the loop
btrfs_zone_activate() checks if block_group->alloc_offset ==
block_group->zone_capacity every time it iterates the loop. But, it is
not depending on the index. Move out the check and do it only once.
Fixes: f9a912a3c45f ("btrfs: zoned: make zone activation multi stripe capable")
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/zoned.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/btrfs/zoned.c b/fs/btrfs/zoned.c index 1b1b310c3c51..b5eb794c1e23 100644 --- a/fs/btrfs/zoned.c +++ b/fs/btrfs/zoned.c @@ -1835,6 +1835,12 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group) goto out_unlock; } + /* No space left */ + if (block_group->alloc_offset == block_group->zone_capacity) { + ret = false; + goto out_unlock; + } + for (i = 0; i < map->num_stripes; i++) { device = map->stripes[i].dev; physical = map->stripes[i].physical; @@ -1842,12 +1848,6 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group) if (device->zone_info->max_active_zones == 0) continue; - /* No space left */ - if (block_group->alloc_offset == block_group->zone_capacity) { - ret = false; - goto out_unlock; - } - if (!btrfs_dev_set_active_zone(device, physical)) { /* Cannot activate the zone */ ret = false; |