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

Assemble: fix call to wait_for 

Recent patch closed 'mdfd' before calling wait_for, which means
it doesn't work.

Put the close back in the right place.

Signed-off-by: NeilBrown <neilb@suse.de>
This commit is contained in:
NeilBrown 2012-11-01 10:50:13 +11:00
parent d5a221a525
commit b20c8a502d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Assemble.c
View File

@ -1654,11 +1654,11 @@ try_again:
clean, avail, start_partial_ok);
if (rv == 1 && !pre_exist)
ioctl(mdfd, STOP_ARRAY, NULL);
close(mdfd);
free(devices);
map_unlock(&map);
if (rv == 0) {
wait_for(chosen_name, mdfd);
close(mdfd);
if (auto_assem) {
int usecs = 1;
/* There is a nasty race with 'mdadm --monitor'.
@ -1685,7 +1685,9 @@ try_again:
usecs <<= 1;
}
}
}
} else
close(mdfd);
/* '2' means 'OK, but not started yet' */
return rv == 2 ? 0 : rv;
}