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

Grow: ensure clean abort if we cannot read the 'completed' file. 

If a read of 'completed' returns an error, select will never fail, so
this loop would never exit.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2011-07-27 17:26:12 +10:00
parent 656b6b5a55
commit 6560987b25
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Grow.c
View File

@ -2725,15 +2725,21 @@ check_progress:
int rv = -2;
tv.tv_sec = 10;
tv.tv_usec = 0;
while (fd >= 0 && rv < 0) {
while (fd >= 0 && rv < 0 && tv.tv_sec > 0) {
fd_set rfds;
FD_ZERO(&rfds);
FD_SET(fd, &rfds);
if (select(fd+1, NULL, NULL, &rfds, &tv) != 1)
break;
if (sysfs_fd_get_ll(fd, &completed) >= 0)
switch (sysfs_fd_get_ll(fd, &completed)) {
case 0:
/* all good again */
rv = 1;
break;
case -2: /* read error - abort */
tv.tv_sec = 0;
break;
}
}
if (fd >= 0)
close(fd);

2
sysfs.c
View File

@ -470,7 +470,7 @@ int sysfs_fd_get_ll(int fd, unsigned long long *val)
lseek(fd, 0, 0);
n = read(fd, buf, sizeof(buf));
if (n <= 0)
return -1;
return -2;
buf[n] = 0;
*val = strtoull(buf, &ep, 0);
if (ep == buf || (*ep != 0 && *ep != '\n' && *ep != ' '))