summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmg <jmg@FreeBSD.org>1998-06-30 03:01:37 +0000
committerjmg <jmg@FreeBSD.org>1998-06-30 03:01:37 +0000
commit0e50288276d8ff2dfaeb04fd409010e684eeb5ab (patch)
tree54b9314f4f3252a682e1cc8be7fa4bbcbde43dd1
parentdf6e9974fcd1a7e7d25c8ec26843c5efbf622c84 (diff)
downloadFreeBSD-src-0e50288276d8ff2dfaeb04fd409010e684eeb5ab.zip
FreeBSD-src-0e50288276d8ff2dfaeb04fd409010e684eeb5ab.tar.gz
convert some nfs tunables to options, these are:
NFS_MINATTRTIMO VREG attrib cache timeout in sec NFS_MAXATTRTIMO NFS_MINDIRATTRTIMO VDIR attrib cache timeout in sec NFS_MAXDIRATTRTIMO NFS_GATHERDELAY Default write gather delay (msec) NFS_UIDHASHSIZ Tune the size of nfssvc_sock with this NFS_WDELAYHASHSIZ and with this NFS_MUIDHASHSIZ Tune the size of nfsmount with this NFS_NOSERVER (already documented in LINT) NFS_DEBUG turn on NFS debugging also, because NFS_ROOT is used by very different files, it has been renamed to opt_nfsroot.h instead of the old opt_nfs.h....
-rw-r--r--sys/amd64/amd64/autoconf.c4
-rw-r--r--sys/amd64/amd64/locore.S4
-rw-r--r--sys/amd64/amd64/locore.s4
-rw-r--r--sys/conf/NOTES14
-rw-r--r--sys/conf/options16
-rw-r--r--sys/i386/conf/LINT14
-rw-r--r--sys/i386/conf/NOTES14
-rw-r--r--sys/i386/i386/autoconf.c4
-rw-r--r--sys/i386/i386/locore.s4
-rw-r--r--sys/nfs/nfs.h4
-rw-r--r--sys/nfsclient/nfs.h4
-rw-r--r--sys/nfsclient/nfsargs.h4
-rw-r--r--sys/nfsclient/nfsstats.h4
-rw-r--r--sys/nfsserver/nfs.h4
-rw-r--r--sys/nfsserver/nfsrvstats.h4
15 files changed, 81 insertions, 21 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index f7c0960..487d39d 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.97 1998/05/12 17:33:58 bde Exp $
+ * $Id: autoconf.c,v 1.98 1998/06/09 12:52:31 bde Exp $
*/
/*
@@ -50,7 +50,7 @@
#include "opt_ffs.h"
#include "opt_cd9660.h"
#include "opt_mfs.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 91e2fa1..ff28a23 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
+ * $Id: locore.s,v 1.109 1998/06/21 18:02:34 bde Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -46,7 +46,7 @@
#include "apm.h"
#include "opt_bootp.h"
#include "opt_ddb.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 91e2fa1..ff28a23 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
+ * $Id: locore.s,v 1.109 1998/06/21 18:02:34 bde Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -46,7 +46,7 @@
#include "apm.h"
#include "opt_bootp.h"
#include "opt_ddb.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 3eec979..5faea2f 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.438 1998/06/21 13:36:53 bde Exp $
+# $Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -533,6 +533,18 @@ options SUIDDIR
# in the NULL filesystem
#options SAFETY
+
+# NFS options:
+options "NFS_MINATTRTIMO=3" # VREG attrib cache timeout in sec
+options "NFS_MAXATTRTIMO=60"
+options "NFS_MINDIRATTRTIMO=30" # VDIR attrib cache timeout in sec
+options "NFS_MAXDIRATTRTIMO=60"
+options "NFS_GATHERDELAY=10" # Default write gather delay (msec)
+options "NFS_UIDHASHSIZ=29" # Tune the size of nfssvc_sock with this
+options "NFS_WDELAYHASHSIZ=16" # and with this
+options "NFS_MUIDHASHSIZ=63" # Tune the size of nfsmount with this
+options NFS_DEBUG # Enable NFS Debugging
+
#####################################################################
# POSIX P1003.1B
diff --git a/sys/conf/options b/sys/conf/options
index eac6fff..fff0df4 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -1,4 +1,4 @@
-# $Id: options,v 1.77 1998/06/07 17:09:26 dfr Exp $
+# $Id: options,v 1.78 1998/06/28 01:03:13 dfr Exp $
#
# On the handling of kernel options
#
@@ -103,7 +103,7 @@ SOFTUPDATES opt_ffs.h
# they won't make any difference yet).
CD9660_ROOT opt_cd9660.h
FFS_ROOT opt_ffs.h
-NFS_ROOT opt_nfs.h
+NFS_ROOT opt_nfsroot.h
# Multi-session CD-Rs might require a huge amount of time in order to
# "settle". If we are about mounting them as the root f/s, we gotta
@@ -236,5 +236,17 @@ KEY_DEBUG opt_key.h
# Size of the kernel message buffer
MSGBUF_SIZE opt_msgbuf.h
+# NFS options
+NFS_MINATTRTIMO opt_nfs.h
+NFS_MAXATTRTIMO opt_nfs.h
+NFS_MINDIRATTRTIMO opt_nfs.h
+NFS_MAXDIRATTRTIMO opt_nfs.h
+NFS_GATHERDELAY opt_nfs.h
+NFS_UIDHASHSIZ opt_nfs.h
+NFS_WDELAYHASHSIZ opt_nfs.h
+NFS_MUIDHASHSIZ opt_nfs.h
+NFS_NOSERVER opt_nfs.h
+NFS_DEBUG opt_nfs.h
+
# Include tweaks for running under the SimOS machine simulator.
SIMOS opt_simos.h
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index 3eec979..5faea2f 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.438 1998/06/21 13:36:53 bde Exp $
+# $Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -533,6 +533,18 @@ options SUIDDIR
# in the NULL filesystem
#options SAFETY
+
+# NFS options:
+options "NFS_MINATTRTIMO=3" # VREG attrib cache timeout in sec
+options "NFS_MAXATTRTIMO=60"
+options "NFS_MINDIRATTRTIMO=30" # VDIR attrib cache timeout in sec
+options "NFS_MAXDIRATTRTIMO=60"
+options "NFS_GATHERDELAY=10" # Default write gather delay (msec)
+options "NFS_UIDHASHSIZ=29" # Tune the size of nfssvc_sock with this
+options "NFS_WDELAYHASHSIZ=16" # and with this
+options "NFS_MUIDHASHSIZ=63" # Tune the size of nfsmount with this
+options NFS_DEBUG # Enable NFS Debugging
+
#####################################################################
# POSIX P1003.1B
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index 3eec979..5faea2f 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can.
#
-# $Id: LINT,v 1.438 1998/06/21 13:36:53 bde Exp $
+# $Id: LINT,v 1.439 1998/06/24 22:01:32 msmith Exp $
#
# NB: You probably don't want to try running a kernel built from this
# file. Instead, you should start from GENERIC, and add options from
@@ -533,6 +533,18 @@ options SUIDDIR
# in the NULL filesystem
#options SAFETY
+
+# NFS options:
+options "NFS_MINATTRTIMO=3" # VREG attrib cache timeout in sec
+options "NFS_MAXATTRTIMO=60"
+options "NFS_MINDIRATTRTIMO=30" # VDIR attrib cache timeout in sec
+options "NFS_MAXDIRATTRTIMO=60"
+options "NFS_GATHERDELAY=10" # Default write gather delay (msec)
+options "NFS_UIDHASHSIZ=29" # Tune the size of nfssvc_sock with this
+options "NFS_WDELAYHASHSIZ=16" # and with this
+options "NFS_MUIDHASHSIZ=63" # Tune the size of nfsmount with this
+options NFS_DEBUG # Enable NFS Debugging
+
#####################################################################
# POSIX P1003.1B
diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c
index f7c0960..487d39d 100644
--- a/sys/i386/i386/autoconf.c
+++ b/sys/i386/i386/autoconf.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)autoconf.c 7.1 (Berkeley) 5/9/91
- * $Id: autoconf.c,v 1.97 1998/05/12 17:33:58 bde Exp $
+ * $Id: autoconf.c,v 1.98 1998/06/09 12:52:31 bde Exp $
*/
/*
@@ -50,7 +50,7 @@
#include "opt_ffs.h"
#include "opt_cd9660.h"
#include "opt_mfs.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 91e2fa1..ff28a23 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.108 1998/06/03 01:59:42 msmith Exp $
+ * $Id: locore.s,v 1.109 1998/06/21 18:02:34 bde Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -46,7 +46,7 @@
#include "apm.h"
#include "opt_bootp.h"
#include "opt_ddb.h"
-#include "opt_nfs.h"
+#include "opt_nfsroot.h"
#include "opt_userconfig.h"
#include "opt_vm86.h"
diff --git a/sys/nfs/nfs.h b/sys/nfs/nfs.h
index 784df74..f4c6dc1 100644
--- a/sys/nfs/nfs.h
+++ b/sys/nfs/nfs.h
@@ -34,12 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
+ * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $
*/
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
+#include "opt_nfs.h"
+
/*
* Tunable constants for nfs
*/
diff --git a/sys/nfsclient/nfs.h b/sys/nfsclient/nfs.h
index 784df74..f4c6dc1 100644
--- a/sys/nfsclient/nfs.h
+++ b/sys/nfsclient/nfs.h
@@ -34,12 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
+ * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $
*/
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
+#include "opt_nfs.h"
+
/*
* Tunable constants for nfs
*/
diff --git a/sys/nfsclient/nfsargs.h b/sys/nfsclient/nfsargs.h
index 784df74..f4c6dc1 100644
--- a/sys/nfsclient/nfsargs.h
+++ b/sys/nfsclient/nfsargs.h
@@ -34,12 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
+ * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $
*/
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
+#include "opt_nfs.h"
+
/*
* Tunable constants for nfs
*/
diff --git a/sys/nfsclient/nfsstats.h b/sys/nfsclient/nfsstats.h
index 784df74..f4c6dc1 100644
--- a/sys/nfsclient/nfsstats.h
+++ b/sys/nfsclient/nfsstats.h
@@ -34,12 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
+ * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $
*/
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
+#include "opt_nfs.h"
+
/*
* Tunable constants for nfs
*/
diff --git a/sys/nfsserver/nfs.h b/sys/nfsserver/nfs.h
index 784df74..f4c6dc1 100644
--- a/sys/nfsserver/nfs.h
+++ b/sys/nfsserver/nfs.h
@@ -34,12 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
+ * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $
*/
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
+#include "opt_nfs.h"
+
/*
* Tunable constants for nfs
*/
diff --git a/sys/nfsserver/nfsrvstats.h b/sys/nfsserver/nfsrvstats.h
index 784df74..f4c6dc1 100644
--- a/sys/nfsserver/nfsrvstats.h
+++ b/sys/nfsserver/nfsrvstats.h
@@ -34,12 +34,14 @@
* SUCH DAMAGE.
*
* @(#)nfs.h 8.4 (Berkeley) 5/1/95
- * $Id: nfs.h,v 1.39 1998/05/31 19:49:28 peter Exp $
+ * $Id: nfs.h,v 1.40 1998/05/31 20:08:51 peter Exp $
*/
#ifndef _NFS_NFS_H_
#define _NFS_NFS_H_
+#include "opt_nfs.h"
+
/*
* Tunable constants for nfs
*/
OpenPOWER on IntegriCloud