d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

free_vinum: Rearrange sequence of actions to avoid potential race

Browse Source 
condition when shutting down.
This commit is contained in:
grog 2003-05-05 05:28:15 +00:00
parent 933dd0f26d
commit b5095f91a4
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/vinum/vinum.c
View File

@ -35,7 +35,7 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
* $Id: vinum.c,v 1.41 2003/04/28 06:15:36 grog Exp grog $
* $Id: vinum.c,v 1.42 2003/05/04 05:25:14 grog Exp grog $
* $FreeBSD$
*/
@ -198,8 +198,11 @@ free_vinum(int cleardrive)
int i;
int drives_allocated = vinum_conf.drives_allocated;
EVENTHANDLER_DEREGISTER(dev_clone, dev_clone_tag);
while ((vinum_conf.flags & (VF_STOPPING | VF_DAEMONOPEN))
== (VF_STOPPING | VF_DAEMONOPEN)) { /* at least one daemon open, we're stopping */
queue_daemon_request(daemonrq_return, (union daemoninfo) 0); /* stop the daemon */
tsleep(&vinumclose, PUSER, "vstop", 1); /* and wait for it */
}
if (DRIVE != NULL) {
if (cleardrive) { /* remove the vinum config */
for (i = 0; i < drives_allocated; i++)
@ -210,11 +213,6 @@ free_vinum(int cleardrive)
}
Free(DRIVE);
}
while ((vinum_conf.flags & (VF_STOPPING | VF_DAEMONOPEN))
== (VF_STOPPING | VF_DAEMONOPEN)) { /* at least one daemon open, we're stopping */
queue_daemon_request(daemonrq_return, (union daemoninfo) 0); /* stop the daemon */
tsleep(&vinumclose, PUSER, "vstop", 1); /* and wait for it */
}
if (SD != NULL) {
for (i = 0; i < vinum_conf.subdisks_allocated; i++) {
struct sd *sd = &SD[i];
@ -244,6 +242,7 @@ free_vinum(int cleardrive)
}
bzero(&vinum_conf, sizeof(vinum_conf));
vinum_conf.version = VINUMVERSION; /* reinstate version number */
EVENTHANDLER_DEREGISTER(dev_clone, dev_clone_tag);
}
STATIC int