From owner-p4-projects  Fri Nov  1 10:43:52 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A21837B404; Fri,  1 Nov 2002 10:43:50 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0335337B401
	for <perforce@freebsd.org>; Fri,  1 Nov 2002 10:43:50 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B8DCB43E88
	for <perforce@freebsd.org>; Fri,  1 Nov 2002 10:43:49 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gA1IgNmV034225
	for <perforce@freebsd.org>; Fri, 1 Nov 2002 10:42:23 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gA1IgNbh034222
	for perforce@freebsd.org; Fri, 1 Nov 2002 10:42:23 -0800 (PST)
Date: Fri, 1 Nov 2002 10:42:23 -0800 (PST)
Message-Id: <200211011842.gA1IgNbh034222@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 20528 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=20528

Change 20528 by jhb@jhb_laptop on 2002/11/01 10:41:49

	Fix mtx_trylock() to actually panic if we do a mtx_trylock() on a
	mutex we own but have not recursed on.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_mutex.c#53 edit

Differences ...

==== //depot/projects/smpng/sys/kern/kern_mutex.c#53 (text+ko) ====

@@ -462,8 +462,8 @@
 		 * We do not handle recursion in _mtx_trylock; see the
 		 * note at the top of the routine.
 		 */
-		KASSERT(!mtx_recursed(m),
-		    ("mtx_trylock() called on a recursed mutex"));
+		KASSERT(!mtx_owned(m),
+		    ("mtx_trylock() called on a mutex already owned"));
 		WITNESS_LOCK(&m->mtx_object, opts | LOP_EXCLUSIVE | LOP_TRYLOCK,
 		    file, line);
 	}

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message