diff options
| -rw-r--r-- | sys/kern/subr_witness.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index 3fba3fb..c7a5b9d 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1511,12 +1511,6 @@ found: instance->li_line); panic("share->uexcl"); } - if ((instance->li_flags & LI_NORELEASE) != 0 && witness_watch > 0) { - printf("forbidden unlock of (%s) %s @ %s:%d\n", class->lc_name, - lock->lo_name, file, line); - panic("lock marked norelease"); - } - /* If we are recursed, unrecurse. */ if ((instance->li_flags & LI_RECURSEMASK) > 0) { CTR4(KTR_WITNESS, "%s: pid %d unrecursed on %s r=%d", __func__, @@ -1525,6 +1519,12 @@ found: instance->li_flags--; return; } + /* The lock is now being dropped, check for NORELEASE flag */ + if ((instance->li_flags & LI_NORELEASE) != 0 && witness_watch > 0) { + printf("forbidden unlock of (%s) %s @ %s:%d\n", class->lc_name, + lock->lo_name, file, line); + panic("lock marked norelease"); + } /* Otherwise, remove this item from the list. */ s = intr_disable(); |
