diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2007-03-12 19:25:59 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2007-03-12 19:25:59 +0000 |
| commit | e2accbecd55c27c9a1a2365893c0f5d93219d012 (patch) | |
| tree | ca0b2751f85606cf94b365f4b6aaa821bfd43ddd | |
| parent | b570921c68c222dc3b999a7bd7230170676eaa53 (diff) | |
better desiredvnodes not based on maxusers; pedro@ deraadt@ ok
| -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 ed72c4fa57e..558518c7047 100644 --- a/sys/conf/param.c +++ b/sys/conf/param.c @@ -1,4 +1,4 @@ -/* $OpenBSD: param.c,v 1.24 2007/02/14 16:47:04 mickey Exp $ */ +/* $OpenBSD: param.c,v 1.25 2007/03/12 19:25:58 mickey Exp $ */ /* $NetBSD: param.c,v 1.16 1996/03/12 03:08:40 mrg Exp $ */ /* @@ -84,9 +84,6 @@ int tickadj = 240000 / (60 * HZ); /* can adjust 240ms in 60s */ struct timezone tz = { TIMEZONE, DST }; #define NPROC (20 + 16 * MAXUSERS) int maxproc = NPROC; -#define NTEXT (80 + NPROC / 8) /* actually the object cache */ -#define NVNODE (NPROC * 2 + NTEXT + 100) -int desiredvnodes = NVNODE; int maxfiles = 3 * (NPROC + MAXUSERS) + 80; int nmbclust = NMBCLUSTERS; diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index c5da278c9e3..de843b98e08 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vfs_subr.c,v 1.139 2007/02/20 17:42:47 deraadt Exp $ */ +/* $OpenBSD: vfs_subr.c,v 1.140 2007/03/12 19:25:58 mickey Exp $ */ /* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */ /* @@ -118,6 +118,7 @@ void printlockedvnodes(void); KNOTE((struct klist *)&vp->v_selectinfo.vsi_selinfo.si_note, (b)) struct pool vnode_pool; +int desiredvnodes; /* * Initialize the vnode management data structures. @@ -126,6 +127,8 @@ void vntblinit(void) { + /* every buffer needs its vnode! */ + desiredvnodes = nbuf; pool_init(&vnode_pool, sizeof(struct vnode), 0, 0, 0, "vnodes", &pool_allocator_nointr); simple_lock_init(&mntvnode_slock); |