Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 28 Feb 2011 05:45:31 +0000 (UTC)
From:      Pawel Jakub Dawidek <pjd@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r219092 - head/sys/cddl/compat/opensolaris/kern
Message-ID:  <201102280545.p1S5jVuY026614@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201102280545.p1S5jVuY026614>