From b29bfc6efa41286e8e8c40ca78e9a0a595d83376 Mon Sep 17 00:00:00 2001 From: jeff Date: Fri, 22 Apr 2005 22:39:46 +0000 Subject: [PATCH] - Check LO_DUPOK as well as LOP_DUPOK when determining whether we should warn about duplicate acquires. Sponsored by: Isilon Systems, Inc. --- sys/kern/subr_witness.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_witness.c b/sys/kern/subr_witness.c index ecba17f24da7..f56b6d569eef 100644 --- a/sys/kern/subr_witness.c +++ b/sys/kern/subr_witness.c @@ -791,7 +791,8 @@ witness_checkorder(struct lock_object *lock, int flags, const char *file, lock1 = &(*lock_list)->ll_children[(*lock_list)->ll_count - 1]; w1 = lock1->li_lock->lo_witness; if (w1 == w) { - if (w->w_same_squawked || (lock->lo_flags & LO_DUPOK)) + if (w->w_same_squawked || (lock->lo_flags & LO_DUPOK) || + (flags & LOP_DUPOK)) return; w->w_same_squawked = 1; printf("acquiring duplicate lock of same type: \"%s\"\n",