c8h4/btrfs-progs
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

btrfs-progs: use sub_stripes property from btrfs_raid_attr

Browse source 
Both btrfs_raid_attr and btrfs_raid_profile define the number of
sub_stripes a raid type has.

Use the one from btrfs_raid_attr and get rid of the field in
btrfs_raid_profile.

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-23 16:10:16 +02:00 committed by David Sterba
parent 5de63ab1c9
commit 6b2d7c799c
1 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
volumes.c
View file

@ -1002,61 +1002,51 @@ static const struct btrfs_raid_profile {
int num_stripes;
int max_stripes;
int min_stripes;
int sub_stripes;
} btrfs_raid_profile_table[BTRFS_NR_RAID_TYPES] = {
[BTRFS_RAID_RAID10] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 4,
.sub_stripes = 2,
},
[BTRFS_RAID_RAID1] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 2,
.sub_stripes = 1,
},
[BTRFS_RAID_RAID1C3] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 3,
.sub_stripes = 1,
},
[BTRFS_RAID_RAID1C4] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 4,
.sub_stripes = 1,
},
[BTRFS_RAID_DUP] = {
.num_stripes = 2,
.max_stripes = 0,
.min_stripes = 2,
.sub_stripes = 1,
},
[BTRFS_RAID_RAID0] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 2,
.sub_stripes = 1,
},
[BTRFS_RAID_SINGLE] = {
.num_stripes = 1,
.max_stripes = 0,
.min_stripes = 1,
.sub_stripes = 1,
},
[BTRFS_RAID_RAID5] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 2,
.sub_stripes = 1,
},
[BTRFS_RAID_RAID6] = {
.num_stripes = 0,
.max_stripes = 0,
.min_stripes = 3,
.sub_stripes = 1,
},
};
@ -1067,7 +1057,7 @@ static void init_alloc_chunk_ctl(struct btrfs_fs_info *info,
ctl->num_stripes = btrfs_raid_profile_table[type].num_stripes;
ctl->min_stripes = btrfs_raid_profile_table[type].min_stripes;
ctl->sub_stripes = btrfs_raid_profile_table[type].sub_stripes;
ctl->sub_stripes = btrfs_raid_array[type].sub_stripes;
ctl->stripe_len = BTRFS_STRIPE_LEN;
switch (type) {