summaryrefslogtreecommitdiff
path: root/sys/kern/vfs_subr.c
diff options
context:
space:
mode:
authorBob Beck <beck@cvs.openbsd.org>2009-06-15 17:01:27 +0000
committerBob Beck <beck@cvs.openbsd.org>2009-06-15 17:01:27 +0000
commit2ad23154352bb286faa9d4e90c688c5bea78c525 (patch)
tree74d852efc8530c595f03e7c280d4b345659b6e3e /sys/kern/vfs_subr.c
parent53a176b4ab49f0631c3e478055286d9e4e625d32 (diff)
Back out all the buffer cache changes I committed during c2k9. This reverts three
commits: 1) The sysctl allowing bufcachepercent to be changed at boot time. 2) The change moving the buffer cache hash chains to a red-black tree 3) The dynamic buffer cache (Which depended on the earlier too). ok on the backout from marco and todd
Diffstat (limited to 'sys/kern/vfs_subr.c')
-rw-r--r--sys/kern/vfs_subr.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index ced2bdc291e..4d09d4f20a0 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.177 2009/06/06 18:06:22 art Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.178 2009/06/15 17:01:26 beck Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -59,7 +59,6 @@
#include <sys/mbuf.h>
#include <sys/syscallargs.h>
#include <sys/pool.h>
-#include <sys/tree.h>
#include <uvm/uvm_extern.h>
#include <sys/sysctl.h>
@@ -116,19 +115,6 @@ void printlockedvnodes(void);
struct pool vnode_pool;
-static int rb_buf_compare(struct buf *b1, struct buf *b2);
-RB_GENERATE(buf_rb_bufs, buf, b_rbbufs, rb_buf_compare);
-
-static int
-rb_buf_compare(struct buf *b1, struct buf *b2)
-{
- if (b1->b_lblkno < b2->b_lblkno)
- return(-1);
- if (b1->b_lblkno > b2->b_lblkno)
- return(1);
- return(0);
-}
-
/*
* Initialize the vnode management data structures.
*/
@@ -359,7 +345,6 @@ getnewvnode(enum vtagtype tag, struct mount *mp, int (**vops)(void *),
((TAILQ_FIRST(listhd = &vnode_hold_list) == NULL) || toggle))) {
splx(s);
vp = pool_get(&vnode_pool, PR_WAITOK | PR_ZERO);
- RB_INIT(&vp->v_bufs_tree);
numvnodes++;
} else {
for (vp = TAILQ_FIRST(listhd); vp != NULLVP;