From owner-svn-src-projects@FreeBSD.ORG  Fri Feb  3 02:15:59 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 DA3E1106567D;
	Fri,  3 Feb 2012 02:15:59 +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 C98C78FC08;
	Fri,  3 Feb 2012 02:15:59 +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 q132Fxtk065478;
	Fri, 3 Feb 2012 02:15:59 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q132Fx43065475;
	Fri, 3 Feb 2012 02:15:59 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201202030215.q132Fx43065475@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Fri, 3 Feb 2012 02:15:59 +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: r230927 - 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: Fri, 03 Feb 2012 02:15:59 -0000

Author: rmacklem
Date: Fri Feb  3 02:15:59 2012
New Revision: 230927
URL: http://svn.freebsd.org/changeset/base/230927

Log:
  Add the macro that does mtx_destroy() to the code that frees up
  Date Server (DS) information structures.

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

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Fri Feb  3 02:06:14 2012	(r230926)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Fri Feb  3 02:15:59 2012	(r230927)
@@ -5040,6 +5040,7 @@ nfsrpc_fillsa(struct nfsmount *nmp, stru
 	}
 	if (error != 0) {
 		NFSFREECRED(dsp->nfsclds_sock.nr_cred);
+		NFSFREEMUTEX(&dsp->nfsclds_sock.nr_mtx);
 		free(dsp->nfsclds_sock.nr_nam, M_SONAME);
 		NFSBZERO(dsp, sizeof(*dsp));
 	}

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Fri Feb  3 02:06:14 2012	(r230926)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clstate.c	Fri Feb  3 02:15:59 2012	(r230927)
@@ -4631,8 +4631,9 @@ nfscl_freedevinfo(struct nfscldevinfo *d
 	for (i = 0; i < dip->nfsdi_addrcnt; i++) {
 		dsp = nfsfldi_addr(dip, i);
 		if (dsp->nfsclds_sock.nr_nam != NULL) {
-			/* Both are set or both are NULL. */
+			/* All are set or none are. */
 			NFSFREECRED(dsp->nfsclds_sock.nr_cred);
+			NFSFREEMUTEX(&dsp->nfsclds_sock.nr_mtx);
 			free(dsp->nfsclds_sock.nr_nam, M_SONAME);
 		}
 	}