diff options
| author | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-05-31 05:12:42 +0000 |
|---|---|---|
| committer | Pedro Martelletto <pedro@cvs.openbsd.org> | 2007-05-31 05:12:42 +0000 |
| commit | 86c7400523ae72abf1b81bb6ef63db57ae343603 (patch) | |
| tree | 72c9518a00af41aba81752b99e3ecbacb3eb33a8 | |
| parent | ec1778cddc212a1767ebd78b38099246c0a4d3b4 (diff) | |
NFSv2 cannot cope with a big number of vnodes, so revert to NPROC-based
calculation until the problem is fixed, okay beck@ art@
| -rw-r--r-- | sys/conf/param.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/conf/param.c b/sys/conf/param.c index b4196ec8faf..3436c43309e 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -1,4 +1,4 @@ -/* $OpenBSD: param.c,v 1.26 2007/05/26 20:26:51 pedro Exp $ */ +/* $OpenBSD: param.c,v 1.27 2007/05/31 05:12:41 pedro Exp $ */ /* $NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $ */ /* @@ -83,6 +83,9 @@ int tick = 1000000 / HZ; int tickadj = 240000 / (60 * HZ); /* can adjust 240ms in 60s */ struct timezone tz = { TIMEZONE, DST }; #define NPROC (20 + 16 * MAXUSERS) +#define NTEXT (80 + NPROC / 8) /* actually the object cache */ +#define NVNODE (NPROC * 2 + NTEXT + 100) +int desiredvnodes = NVNODE; int maxproc = NPROC; int maxfiles = 3 * (NPROC + MAXUSERS) + 80; int nmbclust = NMBCLUSTERS; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 0aec0ef126d..012ba43e4b5 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.151 2007/05/30 04:27:42 beck Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.152 2007/05/31 05:12:41 pedro Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -111,7 +111,6 @@ void printlockedvnodes(void); #endif struct pool vnode_pool; -int desiredvnodes; /* * Initialize the vnode management data structures. @@ -119,8 +118,6 @@ int desiredvnodes; void vntblinit(void) { - - desiredvnodes = bufpages; pool_init(&vnode_pool, sizeof(struct vnode), 0, 0, 0, "vnodes", &pool_allocator_nointr); TAILQ_INIT(&vnode_hold_list); |