diff options
| author | jhb <jhb@FreeBSD.org> | 2008-09-10 19:13:30 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2008-09-10 19:13:30 +0000 |
| commit | af0471aaecf118efcab5180cdca70a1151722ae3 (patch) | |
| tree | 5defb101ad58952942e4cc44e94404cf65868d19 /sys/kern/kern_sx.c | |
| parent | bc107b3828d742160ad1da66c6e2577731499014 (diff) | |
| download | FreeBSD-src-af0471aaecf118efcab5180cdca70a1151722ae3.zip FreeBSD-src-af0471aaecf118efcab5180cdca70a1151722ae3.tar.gz | |
Teach WITNESS about the interlocks used with lockmgr. This removes a bunch
of spurious witness warnings since lockmgr grew witness support. Before
this, every time you passed an interlock to a lockmgr lock WITNESS treated
it as a LOR.
Reviewed by: attilio
Diffstat (limited to 'sys/kern/kern_sx.c')
| -rw-r--r-- | sys/kern/kern_sx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index 5006793..e1e34ec 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -211,7 +211,7 @@ _sx_slock(struct sx *sx, int opts, const char *file, int line) MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_slock() of destroyed sx @ %s:%d", file, line)); - WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER, file, line); + WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER, file, line, NULL); error = __sx_slock(sx, opts, file, line); if (!error) { LOCK_LOG_LOCK("SLOCK", &sx->lock_object, 0, 0, file, line); @@ -254,7 +254,7 @@ _sx_xlock(struct sx *sx, int opts, const char *file, int line) KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xlock() of destroyed sx @ %s:%d", file, line)); WITNESS_CHECKORDER(&sx->lock_object, LOP_NEWORDER | LOP_EXCLUSIVE, file, - line); + line, NULL); error = __sx_xlock(sx, curthread, opts, file, line); if (!error) { LOCK_LOG_LOCK("XLOCK", &sx->lock_object, 0, sx->sx_recurse, |
