From owner-svn-src-head@FreeBSD.ORG  Mon Feb 28 05:45:31 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6EDBD106564A;
	Mon, 28 Feb 2011 05:45:31 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5D5758FC0C;
	Mon, 28 Feb 2011 05:45:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1S5jVHq026616;
	Mon, 28 Feb 2011 05:45:31 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1S5jVuY026614;
	Mon, 28 Feb 2011 05:45:31 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201102280545.p1S5jVuY026614@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Mon, 28 Feb 2011 05:45:31 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219092 - head/sys/cddl/compat/opensolaris/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Feb 2011 05:45:31 -0000

Author: pjd
Date: Mon Feb 28 05:45:31 2011
New Revision: 219092
URL: http://svn.freebsd.org/changeset/base/219092

Log:
  Use proper lock in assertion.
  
  MFC after:	1 month

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c	Sun Feb 27 21:32:25 2011	(r219091)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_sunddi.c	Mon Feb 28 05:45:31 2011	(r219092)
@@ -94,7 +94,7 @@ ddi_get_soft_state_locked(struct ddi_sof
 {
 	struct ddi_soft_state_item *itemp;
 
-	ASSERT(MUTEX_HELD(&zfsdev_state_lock));
+	ASSERT(MUTEX_HELD(&ss->ss_lock));
 
 	LIST_FOREACH(itemp, &ss->ss_list, ssi_next) {
 		if (itemp->ssi_item == item)
@@ -142,7 +142,7 @@ ddi_soft_state_free_locked(struct ddi_so
 {
 	struct ddi_soft_state_item *itemp;
 
-	ASSERT(MUTEX_HELD(&zfsdev_state_lock));
+	ASSERT(MUTEX_HELD(&ss->ss_lock));
 
 	LIST_FOREACH(itemp, &ss->ss_list, ssi_next) {
 		if (itemp->ssi_item == item)