From 8a1845e49f56720cbfccd4c7f5f80ba5b980fdf4 Mon Sep 17 00:00:00 2001 From: Artur Grabowski Date: Tue, 27 Nov 2001 05:27:13 +0000 Subject: Merge in the unified buffer cache code as found in NetBSD 2001/03/10. The code is written mostly by Chuck Silvers /. Tested for the past few weeks by many developers, should be in a pretty stable state, but will require optimizations and additional cleanups. --- sys/uvm/uvm_vnode.h | 52 +--------------------------------------------------- 1 file changed, 1 insertion(+), 51 deletions(-) (limited to 'sys/uvm/uvm_vnode.h') diff --git a/sys/uvm/uvm_vnode.h b/sys/uvm/uvm_vnode.h index 29efe4d2ac4..ce853189207 100644 --- a/sys/uvm/uvm_vnode.h +++ b/sys/uvm/uvm_vnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvm_vnode.h,v 1.8 2001/08/06 14:03:05 art Exp $ */ +/* $OpenBSD: uvm_vnode.h,v 1.9 2001/11/27 05:27:12 art Exp $ */ /* $NetBSD: uvm_vnode.h,v 1.9 2000/03/26 20:54:48 kleink Exp $ */ /* @@ -55,56 +55,6 @@ struct uvm_vnode { int u_flags; /* flags */ int u_nio; /* number of running I/O requests */ voff_t u_size; /* size of object */ - - /* the following entry is locked by uvn_wl_lock */ - LIST_ENTRY(uvm_vnode) u_wlist; /* list of writeable vnode objects */ - - /* the following entry is locked by uvn_sync_lock */ - SIMPLEQ_ENTRY(uvm_vnode) u_syncq; /* vnode objects due for a "sync" */ }; -/* - * u_flags values - */ -#define UVM_VNODE_VALID 0x001 /* we are attached to the vnode */ -#define UVM_VNODE_CANPERSIST 0x002 /* we can persist after ref == 0 */ -#define UVM_VNODE_ALOCK 0x004 /* uvn_attach is locked out */ -#define UVM_VNODE_DYING 0x008 /* final detach/terminate in - progress */ -#define UVM_VNODE_RELKILL 0x010 /* uvn should be killed by releasepg - when final i/o is done */ -#define UVM_VNODE_WANTED 0x020 /* someone is waiting for alock, - dying, or relkill to clear */ -#define UVM_VNODE_VNISLOCKED 0x040 /* underlying vnode struct is locked - (valid when DYING is true) */ -#define UVM_VNODE_IOSYNC 0x080 /* I/O sync in progress ... setter - sleeps on &uvn->u_nio */ -#define UVM_VNODE_IOSYNCWANTED 0x100 /* a process is waiting for the - i/o sync to clear so it can do - i/o */ -#define UVM_VNODE_WRITEABLE 0x200 /* uvn has pages that are writeable */ - -/* - * UVM_VNODE_BLOCKED: any condition that should new processes from - * touching the vnode [set WANTED and sleep to wait for it to clear] - */ -#define UVM_VNODE_BLOCKED (UVM_VNODE_ALOCK|UVM_VNODE_DYING|UVM_VNODE_RELKILL) - -#ifdef _KERNEL - -/* - * prototypes - */ - -#if 0 -/* - * moved uvn_attach to uvm_extern.h because uvm_vnode.h is needed to - * include sys/vnode.h, and files that include sys/vnode.h don't know - * what a vm_prot_t is. - */ -struct uvm_object *uvn_attach __P((void *, vm_prot_t)); -#endif - -#endif /* _KERNEL */ - #endif /* _UVM_UVM_VNODE_H_ */ -- cgit v1.2.3