Revert an untested local change that crept in with the lo_class changes
and subsequently broke the build. This change is supposed to fix the case where doing a mtx_destroy() off a spin mutex while you hold it fails. If it had been tested I would just leave it in, but it hasn't been tested yet, so it will have to wait until later.
This commit is contained in:
parent
d827aa478d
commit
3b783acd2a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=154098
@ -883,10 +883,6 @@ mtx_destroy(struct mtx *m)
|
|||||||
else {
|
else {
|
||||||
MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0);
|
MPASS((m->mtx_lock & (MTX_RECURSED|MTX_CONTESTED)) == 0);
|
||||||
|
|
||||||
/* Perform the non-mtx related part of mtx_unlock_spin(). */
|
|
||||||
if (LO_CLASSINDEX(&m->mtx_object) == LOCK_CLASS_SPIN_MUTEX)
|
|
||||||
spinlock_exit();
|
|
||||||
|
|
||||||
/* Tell witness this isn't locked to make it happy. */
|
/* Tell witness this isn't locked to make it happy. */
|
||||||
WITNESS_UNLOCK(&m->mtx_object, LOP_EXCLUSIVE, __FILE__,
|
WITNESS_UNLOCK(&m->mtx_object, LOP_EXCLUSIVE, __FILE__,
|
||||||
__LINE__);
|
__LINE__);
|
||||||
|
Loading…
Reference in New Issue
Block a user