From owner-svn-src-all@FreeBSD.ORG  Sat Feb 28 10:35:30 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BC1E41065676;
	Sat, 28 Feb 2009 10:35:30 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A9F688FC1A;
	Sat, 28 Feb 2009 10:35:30 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1SAZUe4004972;
	Sat, 28 Feb 2009 10:35:30 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1SAZU4T004960;
	Sat, 28 Feb 2009 10:35:30 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <200902281035.n1SAZU4T004960@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Sat, 28 Feb 2009 10:35:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r189148 - in stable/7/sys: . cam contrib/pf dev/cxgb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 28 Feb 2009 10:35:31 -0000

Author: trasz
Date: Sat Feb 28 10:35:30 2009
New Revision: 189148
URL: http://svn.freebsd.org/changeset/base/189148

Log:
  MFC r186320:
  
  Fix cam_sim_free() wakeup condition and add mtx_asserts.
  
  Submitted by:	Christoph Mallon
  Reviewed by:	scottl
  Approved by:	rwatson (mentor)
  Sponsored by:	FreeBSD Foundation

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/cam/cam_sim.c
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/cam/cam_sim.c
==============================================================================
--- stable/7/sys/cam/cam_sim.c	Sat Feb 28 10:33:00 2009	(r189147)
+++ stable/7/sys/cam/cam_sim.c	Sat Feb 28 10:35:30 2009	(r189148)
@@ -123,9 +123,10 @@ void
 cam_sim_release(struct cam_sim *sim)
 {
 	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
+	mtx_assert(sim->mtx, MA_OWNED);
 
 	sim->refcount--;
-	if (sim->refcount <= 1)
+	if (sim->refcount == 0)
 		wakeup(sim);
 }
 
@@ -133,6 +134,7 @@ void
 cam_sim_hold(struct cam_sim *sim)
 {
 	KASSERT(sim->refcount >= 1, ("sim->refcount >= 1"));
+	mtx_assert(sim->mtx, MA_OWNED);
 
 	sim->refcount++;
 }