From owner-svn-src-head@FreeBSD.ORG  Sun May 23 10:08:05 2010
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 725C21065674;
	Sun, 23 May 2010 10:08:05 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 61EF68FC0C;
	Sun, 23 May 2010 10:08:05 +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 o4NA85r8042161;
	Sun, 23 May 2010 10:08:05 GMT (envelope-from mm@svn.freebsd.org)
Received: (from mm@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o4NA85Eu042159;
	Sun, 23 May 2010 10:08:05 GMT (envelope-from mm@svn.freebsd.org)
Message-Id: <201005231008.o4NA85Eu042159@svn.freebsd.org>
From: Martin Matuska <mm@FreeBSD.org>
Date: Sun, 23 May 2010 10:08:05 +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: r208442 -
	head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
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: Sun, 23 May 2010 10:08:05 -0000

Author: mm
Date: Sun May 23 10:08:05 2010
New Revision: 208442
URL: http://svn.freebsd.org/changeset/base/208442

Log:
  Fix mutex_exit misorder that can cause a kernel panic.
  
  OpenSolaris onnv revision:	8667:5c308a17eb7c
  
  Approved by:	delphij (mentor)
  Obtained from:	OpenSolaris (Bug ID 6795440)
  MFC after:	1 day

Modified:
  head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c

Modified: head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun May 23 09:44:48 2010	(r208441)
+++ head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c	Sun May 23 10:08:05 2010	(r208442)
@@ -2082,10 +2082,10 @@ spa_create(const char *pool, nvlist_t *n
 	if (version >= SPA_VERSION_ZPOOL_HISTORY && history_str != NULL)
 		(void) spa_history_log(spa, history_str, LOG_CMD_POOL_CREATE);
 
-	mutex_exit(&spa_namespace_lock);
-
 	spa->spa_minref = refcount_count(&spa->spa_refcount);
 
+	mutex_exit(&spa_namespace_lock);
+
 	return (0);
 }