diff options
| -rw-r--r-- | sys/conf/NOTES | 10 | ||||
| -rw-r--r-- | sys/conf/options | 2 | ||||
| -rw-r--r-- | sys/conf/param.c | 5 | ||||
| -rw-r--r-- | sys/i386/conf/LINT | 10 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 10 | ||||
| -rw-r--r-- | sys/kern/subr_param.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_export.c | 2 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 2 | ||||
| -rw-r--r-- | sys/sys/vnode.h | 1 |
9 files changed, 3 insertions, 44 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 9527e19..2ec2903 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -61,16 +61,6 @@ options "MAXDSIZ=(256*1024*1024)" options "DFLDSIZ=(256*1024*1024)" # -# Under some circumstances it is useful to have an extra number of -# vnode data structures allocated at boot time. In particular, -# usenet news servers can benefit if there are enough vnodes to -# cache the busiest newsgroup and overview directories. Beware that -# this is an expensive option, it consumes physical non-pageable ram. -# A busy news server may benefit from 10,000 extra vnodes or so. -# -options EXTRAVNODES=1 - -# # A math emulator is mandatory if you wish to run on hardware which # does not have a floating-point processor. Pick either the original, # bogus (but freely-distributable) math emulator, or a much more diff --git a/sys/conf/options b/sys/conf/options index c23f411..842e207 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -34,7 +34,7 @@ UMAPFS opt_dontuse.h UNION # Options used only in param.c. -EXTRAVNODES opt_param.h +EXTRAVNODES opt_defunct.h MSGMAX opt_param.h MSGMNB opt_param.h MSGMNI opt_param.h diff --git a/sys/conf/param.c b/sys/conf/param.c index 3738a58..0fbbdb5 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -89,11 +89,6 @@ int maxfiles = NPROC*2; /* system wide open files limit */ int maxfilesperproc = NPROC*2; /* per-process open files limit */ int ncallout = 16 + NPROC; /* maximum # of timer events */ -#ifndef EXTRAVNODES -#define EXTRAVNODES 0 -#endif -int extravnodes = EXTRAVNODES; /* spare vnodes to allocate */ - /* maximum # of mbuf clusters */ #ifndef NMBCLUSTERS #define NMBCLUSTERS (512 + MAXUSERS * 16) diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 9527e19..2ec2903 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -61,16 +61,6 @@ options "MAXDSIZ=(256*1024*1024)" options "DFLDSIZ=(256*1024*1024)" # -# Under some circumstances it is useful to have an extra number of -# vnode data structures allocated at boot time. In particular, -# usenet news servers can benefit if there are enough vnodes to -# cache the busiest newsgroup and overview directories. Beware that -# this is an expensive option, it consumes physical non-pageable ram. -# A busy news server may benefit from 10,000 extra vnodes or so. -# -options EXTRAVNODES=1 - -# # A math emulator is mandatory if you wish to run on hardware which # does not have a floating-point processor. Pick either the original, # bogus (but freely-distributable) math emulator, or a much more diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 9527e19..2ec2903 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -61,16 +61,6 @@ options "MAXDSIZ=(256*1024*1024)" options "DFLDSIZ=(256*1024*1024)" # -# Under some circumstances it is useful to have an extra number of -# vnode data structures allocated at boot time. In particular, -# usenet news servers can benefit if there are enough vnodes to -# cache the busiest newsgroup and overview directories. Beware that -# this is an expensive option, it consumes physical non-pageable ram. -# A busy news server may benefit from 10,000 extra vnodes or so. -# -options EXTRAVNODES=1 - -# # A math emulator is mandatory if you wish to run on hardware which # does not have a floating-point processor. Pick either the original, # bogus (but freely-distributable) math emulator, or a much more diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index 3738a58..0fbbdb5 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -89,11 +89,6 @@ int maxfiles = NPROC*2; /* system wide open files limit */ int maxfilesperproc = NPROC*2; /* per-process open files limit */ int ncallout = 16 + NPROC; /* maximum # of timer events */ -#ifndef EXTRAVNODES -#define EXTRAVNODES 0 -#endif -int extravnodes = EXTRAVNODES; /* spare vnodes to allocate */ - /* maximum # of mbuf clusters */ #ifndef NMBCLUSTERS #define NMBCLUSTERS (512 + MAXUSERS * 16) diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c index 1d5fb49..43f8669 100644 --- a/sys/kern/vfs_export.c +++ b/sys/kern/vfs_export.c @@ -115,8 +115,8 @@ static int vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep, void vntblinit() { - desiredvnodes = maxproc + vm_object_cache_max + extravnodes; + desiredvnodes = maxproc + vm_object_cache_max; TAILQ_INIT(&vnode_free_list); CIRCLEQ_INIT(&mountlist); } diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 1d5fb49..43f8669 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -115,8 +115,8 @@ static int vfs_hang_addrlist __P((struct mount *mp, struct netexport *nep, void vntblinit() { - desiredvnodes = maxproc + vm_object_cache_max + extravnodes; + desiredvnodes = maxproc + vm_object_cache_max; TAILQ_INIT(&vnode_free_list); CIRCLEQ_INIT(&mountlist); } diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 17f6284..e3b5a4c 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -228,7 +228,6 @@ void vhold __P((struct vnode *)); */ extern struct vnode *rootvnode; /* root (i.e. "/") vnode */ extern int desiredvnodes; /* number of vnodes desired */ -extern int extravnodes; /* extra vnodes to allocate at boot */ extern int prtactive; /* nonzero to call vprint() */ extern struct vattr va_null; /* predefined null vattr structure */ |
