svn commit: r230927 - projects/nfsv4.1-client/sys/fs/nfsclient
Rick Macklem
rmacklem at FreeBSD.org
Fri Feb 3 02:15:59 UTC 2012
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);
}
}
More information about the svn-src-projects
mailing list