From 9b591da1f639e80a8fadf695a587fc1a46cd99ab Mon Sep 17 00:00:00 2001 From: Johannes Thumshirn Date: Wed, 10 Jun 2020 21:32:51 +0900 Subject: [PATCH] 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 Signed-off-by: David Sterba --- volumes.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/volumes.c b/volumes.c index 9076f055..32d3dfe0 100644 --- a/volumes.c +++ b/volumes.c @@ -1103,7 +1103,7 @@ int btrfs_alloc_chunk(struct btrfs_trans_handle *trans, ctl.num_stripes = 1; ctl.max_stripes = 0; 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.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) return -ENOSPC; ctl.num_stripes &= ~(u32)1; - ctl.sub_stripes = 2; } if (ctl.type == BTRFS_RAID_RAID5) { ctl.min_stripes = btrfs_raid_profile_table[ctl.type].min_stripes;