redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

dm raid: restructure parse_raid_params

Browse source 
In preparation for RAID10 addition to dm-raid, we change an 'if' conditional
to a 'switch' conditional to make it easier to see what is being checked for
each RAID type.

Signed-off-by: Jonathan Brassow <jbrassow@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Jonathan E Brassow 2012-07-27 15:08:04 +01:00 committed by Alasdair G Kergon
parent a58a935d5a
commit f999e8fe70
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/md/dm-raid.c
View file

@ -430,13 +430,28 @@ static int parse_raid_params(struct raid_set *rs, char **argv,
if (!strcasecmp(key, "rebuild")) { if (!strcasecmp(key, "rebuild")) {
rebuild_cnt++; rebuild_cnt++;
if (((rs->raid_type->level != 1) &&
(rebuild_cnt > rs->raid_type->parity_devs)) || switch (rs->raid_type->level) {
((rs->raid_type->level == 1) && case 1:
(rebuild_cnt > (rs->md.raid_disks - 1)))) { if (rebuild_cnt >= rs->md.raid_disks) {
rs->ti->error = "Too many rebuild devices specified";
return -EINVAL;
}
break;
case 4:
case 5:
case 6:
if (rebuild_cnt > rs->raid_type->parity_devs) {
rs->ti->error = "Too many rebuild devices specified for given RAID type"; rs->ti->error = "Too many rebuild devices specified for given RAID type";
return -EINVAL; return -EINVAL;
} }
break;
default:
DMERR("The rebuild parameter is not supported for %s", rs->raid_type->name);
rs->ti->error = "Rebuild not supported for this RAID type";
return -EINVAL;
}
if (value > rs->md.raid_disks) { if (value > rs->md.raid_disks) {
rs->ti->error = "Invalid rebuild index given"; rs->ti->error = "Invalid rebuild index given";
return -EINVAL; return -EINVAL;