Fix use of rv in Grow_reshape
1/ and extra local var was declared, which causes rv setting to be lost 2/ a -ve rv was left -ve while we should be return 1 on err. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
df65ac70ca
commit
b7e734fc22
2
Grow.c
2
Grow.c
|
@ -759,6 +759,7 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
|
||||||
if (err == EBUSY &&
|
if (err == EBUSY &&
|
||||||
(array.state & (1<<MD_SB_BITMAP_PRESENT)))
|
(array.state & (1<<MD_SB_BITMAP_PRESENT)))
|
||||||
fprintf(stderr, " Bitmap must be removed before level can be changed\n");
|
fprintf(stderr, " Bitmap must be removed before level can be changed\n");
|
||||||
|
rv = 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (!changed && !quiet)
|
} else if (!changed && !quiet)
|
||||||
|
@ -789,7 +790,6 @@ int Grow_reshape(char *devname, int fd, int quiet, char *backup_file,
|
||||||
|
|
||||||
array.layout = parse_layout_faulty(layout_str);
|
array.layout = parse_layout_faulty(layout_str);
|
||||||
if (array.layout < 0) {
|
if (array.layout < 0) {
|
||||||
int rv;
|
|
||||||
fprintf(stderr, Name ": %s: layout %s not understood for 'faulty' array\n",
|
fprintf(stderr, Name ": %s: layout %s not understood for 'faulty' array\n",
|
||||||
devname, layout_str);
|
devname, layout_str);
|
||||||
rv = 1;
|
rv = 1;
|
||||||
|
|
Loading…
Reference in New Issue