Verify reshape restart position

Check if reshape restart position is the same as set in md.
If position doesn't match this means that we cannot restart reshape.

Signed-off-by: Adam Kwolek <adam.kwolek@intel.com>
Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
Adam Kwolek 2011-10-03 10:04:32 +11:00 committed by NeilBrown
parent 577e8448e9
commit f1fe496bce
1 changed files with 31 additions and 0 deletions

31
Grow.c
View File

@ -3645,6 +3645,8 @@ int Grow_continue_command(char *devname, int fd,
char buf[40];
int cfd = -1;
int fd2 = -1;
char *ep;
unsigned long long position;
dprintf("Grow continue from command line called for %s\n",
devname);
@ -3746,6 +3748,35 @@ int Grow_continue_command(char *devname, int fd,
}
}
/* verify that array under reshape is started from
* correct position
*/
ret_val = sysfs_get_str(content, NULL, "sync_max", buf, 40);
if (ret_val <= 0) {
fprintf(stderr, Name
": cannot open verify reshape progress for %s (%i)\n",
content->sys_name, ret_val);
ret_val = 1;
goto Grow_continue_command_exit;
}
dprintf(Name ": Read sync_max sysfs entry is: %s\n", buf);
position = strtoull(buf, &ep, 0);
if (ep == buf || (*ep != 0 && *ep != '\n' && *ep != ' ')) {
fprintf(stderr, Name ": Fatal error: array reshape was"
" not properly frozen\n");
ret_val = 1;
goto Grow_continue_command_exit;
}
position *= get_data_disks(map_name(pers, mdstat->level),
content->new_layout,
content->array.raid_disks);
if (position != content->reshape_progress) {
fprintf(stderr, Name ": Fatal error: array reshape was"
" not properly frozen.\n");
ret_val = 1;
goto Grow_continue_command_exit;
}
/* continue reshape
*/
ret_val = Grow_continue(fd, st, content, backup_file, 0);