From 4ec9dc4de2a552b4c41889697e5c7082b2e82aa6 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Fri, 3 Oct 2008 18:13:05 +0000 Subject: [PATCH] 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 --- sys/kern/subr_witness.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index e9d820e9dc9c..1bdf0d3bc74a 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