svn commit: r229264 - in stable/8/sys: conf fs/nfsclient
Rick Macklem
rmacklem at FreeBSD.org
Mon Jan 2 04:47:39 UTC 2012
Author: rmacklem
Date: Mon Jan 2 04:47:38 2012
New Revision: 229264
URL: http://svn.freebsd.org/changeset/base/229264
Log:
MFC: r227517
Move the setting of the default value for nm_wcommitsize to
before the nfs_decode_args() call in the new NFS client, so
that a specfied command line value won't be overwritten.
Also, modify the calculation for small values of desiredvnodes
to avoid an unusually large value or a divide by zero crash.
It seems that the default value for nm_wcommitsize is very
conservative and may need to change at some time.
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 Mon Jan 2 04:25:25 2012 (r229263)
+++ stable/8/sys/fs/nfsclient/nfs_clvfsops.c Mon Jan 2 04:47:38 2012 (r229264)
@@ -1218,6 +1218,10 @@ mountnfs(struct nfs_args *argp, struct m
nmp->nm_timeo = NFS_TIMEO;
nmp->nm_retry = NFS_RETRANS;
nmp->nm_readahead = NFS_DEFRAHEAD;
+ if (desiredvnodes >= 11000)
+ nmp->nm_wcommitsize = hibufspace / (desiredvnodes / 1000);
+ else
+ nmp->nm_wcommitsize = hibufspace / 10;
nfs_decode_args(mp, nmp, argp, hst, cred, td);
@@ -1241,7 +1245,6 @@ mountnfs(struct nfs_args *argp, struct m
nmp->nm_rsize = NFS_RSIZE;
nmp->nm_readdirsize = NFS_READDIRSIZE;
}
- nmp->nm_wcommitsize = hibufspace / (desiredvnodes / 1000);
nmp->nm_numgrps = NFS_MAXGRPS;
nmp->nm_tprintf_delay = nfs_tprintf_delay;
if (nmp->nm_tprintf_delay < 0)
More information about the svn-src-all
mailing list