diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_mutex.c | 12 | ||||
| -rw-r--r-- | sys/kern/subr_turnstile.c | 12 |
2 files changed, 8 insertions, 16 deletions
diff --git a/sys/kern/kern_mutex.c b/sys/kern/kern_mutex.c index 039621b..f5641c5 100644 --- a/sys/kern/kern_mutex.c +++ b/sys/kern/kern_mutex.c @@ -464,19 +464,15 @@ _mtx_trylock(struct mtx *m, int opts, const char *file, int line) MPASS(curthread != NULL); + KASSERT(!mtx_owned(m), + ("mtx_trylock() called on a mutex already owned")); + rval = _obtain_lock(m, curthread); LOCK_LOG_TRY("LOCK", &m->mtx_object, opts, rval, file, line); - if (rval) { - /* - * We do not handle recursion in _mtx_trylock; see the - * note at the top of the routine. - */ - KASSERT(!mtx_recursed(m), - ("mtx_trylock() called on a recursed mutex")); + if (rval) WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); - } return (rval); } diff --git a/sys/kern/subr_turnstile.c b/sys/kern/subr_turnstile.c index 039621b..f5641c5 100644 --- a/sys/kern/subr_turnstile.c +++ b/sys/kern/subr_turnstile.c @@ -464,19 +464,15 @@ _mtx_trylock(struct mtx *m, int opts, const char *file, int line) MPASS(curthread != NULL); + KASSERT(!mtx_owned(m), + ("mtx_trylock() called on a mutex already owned")); + rval = _obtain_lock(m, curthread); LOCK_LOG_TRY("LOCK", &m->mtx_object, opts, rval, file, line); - if (rval) { - /* - * We do not handle recursion in _mtx_trylock; see the - * note at the top of the routine. - */ - KASSERT(!mtx_recursed(m), - ("mtx_trylock() called on a recursed mutex")); + if (rval) WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK, file, line); - } return (rval); } |
