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

Don't drop Giant and the passed in mutex incorrectly in the

Browse Source 
cold || panicstr case.  Do drop the passed in mutex in that case if
PDROP is specified.
This commit is contained in:
John Baldwin 2000-11-29 18:32:50 +00:00
parent 49f158ccc8
commit e2979dcc85
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/kern/kern_synch.c
View File

@ -426,16 +426,6 @@ msleep(ident, mtx, priority, wmesg, timo)
#endif
WITNESS_SLEEP(0, mtx);
mtx_enter(&sched_lock, MTX_SPIN);
DROP_GIANT_NOSWITCH();
if (mtx != NULL) {
mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED);
WITNESS_SAVE(mtx, mtx);
mtx_exit(mtx, MTX_DEF | MTX_NOSWITCH);
if (priority & PDROP)
mtx = NULL;
}
s = splhigh();
if (cold || panicstr) {
/*
@ -444,11 +434,23 @@ msleep(ident, mtx, priority, wmesg, timo)
* don't run any other procs or panic below,
* in case this is the idle process and already asleep.
*/
if (mtx != NULL && priority & PDROP)
mtx_exit(mtx, MTX_DEF | MTX_NOSWITCH);
mtx_exit(&sched_lock, MTX_SPIN);
splx(s);
return (0);
}
DROP_GIANT_NOSWITCH();
if (mtx != NULL) {
mtx_assert(mtx, MA_OWNED | MA_NOTRECURSED);
WITNESS_SAVE(mtx, mtx);
mtx_exit(mtx, MTX_DEF | MTX_NOSWITCH);
if (priority & PDROP)
mtx = NULL;
}
KASSERT(p != NULL, ("msleep1"));
KASSERT(ident != NULL && p->p_stat == SRUN, ("msleep"));
/*