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

imsm: properly handle values of sync_completed 

The sync_completed can be set to such values:
- two numbers of processed sectors and total during synchronization,
separated with '/';
- 'none' if synchronization process is stopped;
- 'delayed' if synchronization process is delayed.
Handle value of sync_completed not only as numbers but
also check for 'none' and 'delayed'.

Signed-off-by: Alexey Obitotskiy <aleksey.obitotskiy@intel.com>
Reviewed-by: Pawel Baldysiak <pawel.baldysiak@intel.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
This commit is contained in:
Alexey Obitotskiy 2016-06-16 11:31:37 +02:00 committed by Jes Sorensen
parent b2be2b628b
commit 0febb20c45
1 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
super-intel.c
View File

@ -10363,6 +10363,33 @@ exit_imsm_reshape_super:
return ret_val;
}
#define COMPLETED_OK 0
#define COMPLETED_NONE 1
#define COMPLETED_DELAYED 2
static int read_completed(int fd, unsigned long long *val)
{
int ret;
char buf[50];
ret = sysfs_fd_get_str(fd, buf, 50);
if (ret < 0)
return ret;
ret = COMPLETED_OK;
if (strncmp(buf, "none", 4) == 0) {
ret = COMPLETED_NONE;
} else if (strncmp(buf, "delayed", 7) == 0) {
ret = COMPLETED_DELAYED;
} else {
char *ep;
*val = strtoull(buf, &ep, 0);
if (ep == buf || (*ep != 0 && *ep != '\n' && *ep != ' '))
ret = -1;
}
return ret;
}
/*******************************************************************************
* Function: wait_for_reshape_imsm
* Description: Function writes new sync_max value and waits until
@ -10417,8 +10444,10 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
}
do {
int rc;
char action[20];
int timeout = 3000;
sysfs_wait(fd, &timeout);
if (sysfs_get_str(sra, NULL, "sync_action",
action, 20) > 0 &&
@ -10428,11 +10457,14 @@ int wait_for_reshape_imsm(struct mdinfo *sra, int ndata)
close(fd);
return -1;
}
if (sysfs_fd_get_ll(fd, &completed) < 0) {
rc = read_completed(fd, &completed);
if (rc < 0) {
dprintf("cannot read reshape_position (in loop)\n");
close(fd);
return 1;
}
} else if (rc == COMPLETED_NONE)
break;
} while (completed < position_to_set);
close(fd);