Martchus
/
mdadm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Grow: make sure rv is set correctly in reshape_container_raid_disks 

Whenever there is an error, rv must be -1.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2010-12-16 09:07:52 +11:00
parent 47eb4d5a18
commit d18bfbe3d0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Grow.c
View File

@ -692,6 +692,7 @@ static int reshape_container_raid_disks(char *container, int raid_disks)
if (!is_container_member(e, container))
continue;
rv = -1;
level = map_name(pers, e->level);
if (level == 0) {
sub = sysfs_read(-1, e->devnum, GET_VERSION);
@ -711,11 +712,10 @@ static int reshape_container_raid_disks(char *container, int raid_disks)
sysfs_free(sub);
level = 4;
}
rv = -1;
sub = NULL;
switch (level) {
default:
rv = -1;
break;
case 6:
parity_disks++;
@ -740,6 +740,7 @@ static int reshape_container_raid_disks(char *container, int raid_disks)
err = errno;
break;
}
rv = -1;
/* fall through */
case 1:
if (!sub)