diff options
| author | jhb <jhb@FreeBSD.org> | 2008-10-03 18:13:05 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2008-10-03 18:13:05 +0000 |
| commit | c07f87c6a9cb1a1e2c8874134cb0d25aa69ceb4e (patch) | |
| tree | 59fd371145b4fd3603a2834ffbe441bd77f84d20 /sys/kern/subr_witness.c | |
| parent | bbc754f502e8dc966e5d05fc4fd4d91d4c136d83 (diff) | |
| download | FreeBSD-src-c07f87c6a9cb1a1e2c8874134cb0d25aa69ceb4e.zip FreeBSD-src-c07f87c6a9cb1a1e2c8874134cb0d25aa69ceb4e.tar.gz | |
Oops, missed updating a place with with 's/lock1/plock/' when adding
interlock support to WITNESS. Specifically, the printf listing the
first location when duplicate locks of the same type are acquired.
Reported by: pho
Diffstat (limited to 'sys/kern/subr_witness.c')
| -rw-r--r-- | sys/kern/subr_witness.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index e9d820e..1bdf0d3 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -1133,10 +1133,11 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file, w_rmatrix[i][i] |= WITNESS_REVERSAL; w->w_reversed = 1; mtx_unlock_spin(&w_mtx); - printf("acquiring duplicate lock of same type: \"%s\"\n", + printf( + "acquiring duplicate lock of same type: \"%s\"\n", w->w_name); - printf(" 1st %s @ %s:%d\n", lock1->li_lock->lo_name, - lock1->li_file, lock1->li_line); + printf(" 1st %s @ %s:%d\n", plock->li_lock->lo_name, + plock->li_file, plock->li_line); printf(" 2nd %s @ %s:%d\n", lock->lo_name, file, line); witness_debugger(1); } else |
