Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 1 Jan 2012 17:05:25 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r229173 - in stable/8/sys: conf fs/nfsclient
Message-ID:  <201201011705.q01H5Pig021735@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: rmacklem
Date: Sun Jan  1 17:05:24 2012
New Revision: 229173
URL: http://svn.freebsd.org/changeset/base/229173

Log:
  MFC: r227493
  Move the assignment of default values for some mount options
  to before the nfs_decode_args() call in the new NFS client,
  so they don't overwrite the value specified on the command line.

Modified:
  stable/8/sys/fs/nfsclient/nfs_clvfsops.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.32   (props changed)
  stable/8/sys/conf/ldscript.mips.octeon1.64   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- stable/8/sys/fs/nfsclient/nfs_clvfsops.c	Sun Jan  1 16:41:33 2012	(r229172)
+++ stable/8/sys/fs/nfsclient/nfs_clvfsops.c	Sun Jan  1 17:05:24 2012	(r229173)
@@ -1208,7 +1208,16 @@ mountnfs(struct nfs_args *argp, struct m
 	vfs_getnewfsid(mp);
 	nmp->nm_mountp = mp;
 	mtx_init(&nmp->nm_mtx, "NFSmount lock", NULL, MTX_DEF | MTX_DUPOK);			
+
+	/*
+	 * Since nfs_decode_args() might optionally set them, these need to
+	 * set to defaults before the call, so that the optional settings
+	 * aren't overwritten.
+	 */
 	nmp->nm_negnametimeo = negnametimeo;
+	nmp->nm_timeo = NFS_TIMEO;
+	nmp->nm_retry = NFS_RETRANS;
+	nmp->nm_readahead = NFS_DEFRAHEAD;
 
 	nfs_decode_args(mp, nmp, argp, hst, cred, td);
 
@@ -1227,8 +1236,6 @@ mountnfs(struct nfs_args *argp, struct m
 	else
 		nmp->nm_maxfilesize = OFF_MAX;
 
-	nmp->nm_timeo = NFS_TIMEO;
-	nmp->nm_retry = NFS_RETRANS;
 	if ((argp->flags & (NFSMNT_NFSV3 | NFSMNT_NFSV4)) == 0) {
 		nmp->nm_wsize = NFS_WSIZE;
 		nmp->nm_rsize = NFS_RSIZE;
@@ -1236,7 +1243,6 @@ mountnfs(struct nfs_args *argp, struct m
 	}
 	nmp->nm_wcommitsize = hibufspace / (desiredvnodes / 1000);
 	nmp->nm_numgrps = NFS_MAXGRPS;
-	nmp->nm_readahead = NFS_DEFRAHEAD;
 	nmp->nm_tprintf_delay = nfs_tprintf_delay;
 	if (nmp->nm_tprintf_delay < 0)
 		nmp->nm_tprintf_delay = 0;

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