From f6739b1ddc8e824b16b1e6dfd40d081cbc4bec59 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Thu, 19 Feb 2004 14:19:31 +0000 Subject: Simplify check. We are only able to check exclusive lock and if 2nd condition is true, first one is true for sure. Approved by: jhb, scottl (mentor) --- sys/kern/kern_sx.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/kern_sx.c b/sys/kern/kern_sx.c index e744f315b8f2..70b860c6470b 100644 --- a/sys/kern/kern_sx.c +++ b/sys/kern/kern_sx.c @@ -348,8 +348,12 @@ _sx_assert(struct sx *sx, int what, const char *file, int line) #ifdef WITNESS witness_assert(&sx->sx_object, what, file, line); #else + /* + * We are able to check only exclusive lock here, + * we cannot assert that *this* thread owns slock. + */ mtx_lock(sx->sx_lock); - if (sx->sx_cnt != 0 && sx->sx_xholder == curthread) + if (sx->sx_xholder == curthread) printf("Lock %s locked @ %s:%d\n", sx->sx_object.lo_name, file, line); mtx_unlock(sx->sx_lock); -- cgit v1.3