From owner-svn-src-projects@FreeBSD.ORG  Mon Mar  5 00:49:08 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 698CA106564A;
	Mon,  5 Mar 2012 00:49:08 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 5523D8FC08;
	Mon,  5 Mar 2012 00:49:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q250n8o0059442;
	Mon, 5 Mar 2012 00:49:08 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q250n8rI059440;
	Mon, 5 Mar 2012 00:49:08 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201203050049.q250n8rI059440@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Mon, 5 Mar 2012 00:49:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232528 - projects/nfsv4.1-client/sys/fs/nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 05 Mar 2012 00:49:08 -0000

Author: rmacklem
Date: Mon Mar  5 00:49:07 2012
New Revision: 232528
URL: http://svn.freebsd.org/changeset/base/232528

Log:
  Add a version of nfscl_reldevinfo() that can be called when the clstate
  mutex is already held. This avoids a panic caused by calling mtx_lock()
  when it was alrady locked.

Modified:
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Mon Mar  5 00:00:19 2012	(r232527)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Mon Mar  5 00:49:07 2012	(r232528)
@@ -117,6 +117,7 @@ static struct nfsclclient *nfscl_getclnt
 static struct nfsclclient *nfscl_getclntsess(uint8_t *);
 static struct nfscldeleg *nfscl_finddeleg(struct nfsclclient *, u_int8_t *,
     int);
+static void nfscl_reldevinfo_locked(struct nfscldevinfo *);
 static struct nfscllayout *nfscl_findlayout(struct nfsclclient *, u_int8_t *,
     int);
 static struct nfscldevinfo *nfscl_finddevinfo(struct nfsclclient *, uint8_t *);
@@ -4528,14 +4529,24 @@ nfscl_getdevinfo(struct nfsclclient *clp
 /*
  * Dereference a devinfo structure.
  */
-void
-nfscl_reldevinfo(struct nfscldevinfo *dip)
+static void
+nfscl_reldevinfo_locked(struct nfscldevinfo *dip)
 {
 
-	NFSLOCKCLSTATE();
 	dip->nfsdi_refcnt--;
 	if (dip->nfsdi_refcnt == 0)
 		wakeup(&dip->nfsdi_refcnt);
+}
+
+/*
+ * Dereference a devinfo structure.
+ */
+void
+nfscl_reldevinfo(struct nfscldevinfo *dip)
+{
+
+	NFSLOCKCLSTATE();
+	nfscl_reldevinfo_locked(dip);
 	NFSUNLOCKCLSTATE();
 }
 
@@ -4613,7 +4624,7 @@ nfscl_adddevinfo(struct nfsmount *nmp, s
 	}
 	tdip = nfscl_finddevinfo(clp, dip->nfsdi_deviceid);
 	if (tdip != NULL) {
-		nfscl_reldevinfo(tdip);
+		nfscl_reldevinfo_locked(tdip);
 		NFSUNLOCKCLSTATE();
 		free(dip, M_NFSDEVINFO);
 		return;