btrfs-progs: consolidate assignment of sub_stripes

Now that we have a table holding the sub_stripes value we can consolidate
all setting of alloc_chunk_ctl::sub_stripes to a signle table lookup.

Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Johannes Thumshirn 2020-06-10 21:32:51 +09:00 committed by David Sterba
parent ea110419ff
commit 9b591da1f6
1 changed files with 1 additions and 2 deletions

View File

@ -1103,7 +1103,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
ctl.num_stripes = 1; ctl.num_stripes = 1;
ctl.max_stripes = 0; ctl.max_stripes = 0;
ctl.min_stripes = btrfs_raid_profile_table[ctl.type].min_stripes; ctl.min_stripes = btrfs_raid_profile_table[ctl.type].min_stripes;
ctl.sub_stripes = 1; ctl.sub_stripes = btrfs_raid_profile_table[ctl.type].sub_stripes;
ctl.stripe_len = BTRFS_STRIPE_LEN; ctl.stripe_len = BTRFS_STRIPE_LEN;
ctl.total_devs = btrfs_super_num_devices(info->super_copy); ctl.total_devs = btrfs_super_num_devices(info->super_copy);
@ -1160,7 +1160,6 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans,
if (ctl.num_stripes < ctl.min_stripes) if (ctl.num_stripes < ctl.min_stripes)
return -ENOSPC; return -ENOSPC;
ctl.num_stripes &= ~(u32)1; ctl.num_stripes &= ~(u32)1;
ctl.sub_stripes = 2;
} }
if (ctl.type == BTRFS_RAID_RAID5) { if (ctl.type == BTRFS_RAID_RAID5) {
ctl.min_stripes = btrfs_raid_profile_table[ctl.type].min_stripes; ctl.min_stripes = btrfs_raid_profile_table[ctl.type].min_stripes;