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

Ignore/don't set data_disks for level=1 

When analyse_change sets level=1, data_disks is meaningless
as is layout.
So don't set them, and make sure we ignore them.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2011-01-27 10:24:25 +10:00
parent c8b06d8239
commit d6bd632c41
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Grow.c
View File

@ -935,9 +935,6 @@ char *analyse_change(struct mdinfo *info, struct reshape *re)
/* Don't know what to do */
return "no change requested for Growing RAID1";
re->level = 1;
re->before.data_disks = (info->array.raid_disks +
info->delta_disks);
re->before.layout = 0;
re->backup_blocks = 0;
re->parity = 0;
return NULL;
@ -1096,8 +1093,6 @@ char *analyse_change(struct mdinfo *info, struct reshape *re)
if (info->array.raid_disks != 2)
return "Can only convert a 2-device array to RAID1";
re->level = 1;
re->before.data_disks = 2;
re->before.layout = 0;
break;
default:
return "Impossible level change requested";
@ -1642,7 +1637,7 @@ static int reshape_array(char *container, int fd, char *devname,
+ reshape.parity - array.raid_disks;
if (!force &&
info->new_level > 0 &&
info->new_level > 1 &&
spares_needed > info->array.spare_disks) {
fprintf(stderr,
Name ": Need %d spare%s to avoid degraded array,"