Grow: fix problem with reshaping RAID4 to RAID0.
As 'layout' doesn't map neatly from RAID4 to RAID5, we need to set it correctly for RAID4. Also, when no reshape is needed we should set re->level to the final desired level. Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
parent
3920235ea2
commit
fdcad551e9
6
Grow.c
6
Grow.c
|
@ -1321,6 +1321,7 @@ char *analyse_change(struct mdinfo *info, struct reshape *re)
|
|||
|
||||
switch (re->level) {
|
||||
case 4:
|
||||
re->before.layout = 0;
|
||||
re->after.layout = 0;
|
||||
break;
|
||||
case 5:
|
||||
|
@ -1336,6 +1337,7 @@ char *analyse_change(struct mdinfo *info, struct reshape *re)
|
|||
|
||||
switch (re->level) {
|
||||
case 4:
|
||||
re->before.layout = 0;
|
||||
re->after.layout = 0;
|
||||
break;
|
||||
case 5:
|
||||
|
@ -1428,12 +1430,14 @@ char *analyse_change(struct mdinfo *info, struct reshape *re)
|
|||
if (re->after.data_disks == re->before.data_disks &&
|
||||
re->after.layout == re->before.layout &&
|
||||
info->new_chunk == info->array.chunk_size) {
|
||||
/* Nothing to change */
|
||||
/* Nothing to change, can change level immediately. */
|
||||
re->level = info->new_level;
|
||||
re->backup_blocks = 0;
|
||||
return NULL;
|
||||
}
|
||||
if (re->after.data_disks == 1 && re->before.data_disks == 1) {
|
||||
/* chunk and layout changes make no difference */
|
||||
re->level = info->new_level;
|
||||
re->backup_blocks = 0;
|
||||
return NULL;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue