From owner-p4-projects@FreeBSD.ORG  Tue Jul 25 17:15:26 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A8CA516A4E7; Tue, 25 Jul 2006 17:15:26 +0000 (UTC)
X-Original-To: perforce@freebsd.org
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 493C916A4E6
	for <perforce@freebsd.org>; Tue, 25 Jul 2006 17:15:26 +0000 (UTC)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D7CBA43D49
	for <perforce@freebsd.org>; Tue, 25 Jul 2006 17:15:25 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6PHFP0g082210
	for <perforce@freebsd.org>; Tue, 25 Jul 2006 17:15:25 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6PHFPU4082207
	for perforce@freebsd.org; Tue, 25 Jul 2006 17:15:25 GMT
	(envelope-from jhb@freebsd.org)
Date: Tue, 25 Jul 2006 17:15:25 GMT
Message-Id: <200607251715.k6PHFPU4082207@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 102393 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Jul 2006 17:15:26 -0000

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

Change 102393 by jhb@jhb_mutex on 2006/07/25 17:14:51

	Missed an unlock case where td_locks needs to be decremented.

Affected files ...

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

Differences ...

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

@@ -912,6 +912,8 @@
 		/* Perform the non-mtx related part of mtx_unlock_spin(). */
 		if (LOCK_CLASS(&m->mtx_object) == &lock_class_mtx_spin)
 			spinlock_exit();
+		else
+			curthread->td_locks--;
 
 		/* Tell witness this isn't locked to make it happy. */
 		WITNESS_UNLOCK(&m->mtx_object, LOP_EXCLUSIVE, __FILE__,