several related changes:

vfs_subr.c:
	add a missing simple_lock_init for vnode interlock
	try to avoid reclaiming locked or layered vnodes
	initialize vnlock pointer to NULL
	remove old code to free vnlock, never used
	lockinit the new vnode lock
vfs_syscalls.c:
	support for VLAYER flag
vnode_if.sh:
	support for splitting VDESC flags
vnode_if.src:
	split VDESC flags
	WILLPUT is the combination of WILLRELE and WILLUNLOCK
	most uses for WILLRELE become WILLPUT
vnode.h:
	add v_lock to struct vnode
	add VLAYER flag
	update for new VDESC flags

1 files changed, 12 insertions, 12 deletions

diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src
index 4eb88e93191..bf5c220660a 100644
--- a/sys/kern/vnode_if.src
+++ b/sys/kern/vnode_if.src
@@ -1,4 +1,4 @@
-#	$OpenBSD: vnode_if.src,v 1.19 2002/02/22 20:37:45 drahn Exp $
+#	$OpenBSD: vnode_if.src,v 1.20 2003/05/01 21:13:05 tedu Exp $
 #	$NetBSD: vnode_if.src,v 1.10 1996/05/11 18:26:27 mycroft Exp $
 #
 # Copyright (c) 1992, 1993
@@ -94,7 +94,7 @@ vop_lookup {
 #
 
 vop_create {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
 	OUT struct vnode **vpp;
 	IN struct componentname *cnp;
 	IN struct vattr *vap;
@@ -106,7 +106,7 @@ vop_create {
 #
 
 vop_mknod {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
 	OUT WILLRELE struct vnode **vpp;
 	IN struct componentname *cnp;
 	IN struct vattr *vap;
@@ -258,8 +258,8 @@ vop_fsync {
 #
 
 vop_remove {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
-	IN SHOULDBELOCKED WILLRELE struct vnode *vp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *vp;
 	IN struct componentname *cnp;
 };
 
@@ -268,7 +268,7 @@ vop_remove {
 #% link		tdvp	L U U
 #
 vop_link {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
 	IN struct vnode *vp;
 	IN struct componentname *cnp;
 };
@@ -284,7 +284,7 @@ vop_rename {
 	IN WILLRELE struct vnode *fdvp;
 	IN WILLRELE struct vnode *fvp;
 	IN struct componentname *fcnp;
-	IN SHOULDBELOCKED WILLRELE struct vnode *tdvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *tdvp;
 	IN WILLRELE struct vnode *tvp;
 	IN struct componentname *tcnp;
 };
@@ -295,7 +295,7 @@ vop_rename {
 #
 
 vop_mkdir {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
 	OUT struct vnode **vpp;
 	IN struct componentname *cnp;
 	IN struct vattr *vap;
@@ -307,8 +307,8 @@ vop_mkdir {
 #
 
 vop_rmdir {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
-	IN SHOULDBELOCKED WILLRELE struct vnode *vp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *vp;
 	IN struct componentname *cnp;
 };
 
@@ -322,7 +322,7 @@ vop_rmdir {
 #
 
 vop_symlink {
-	IN SHOULDBELOCKED WILLRELE struct vnode *dvp;
+	IN SHOULDBELOCKED WILLPUT struct vnode *dvp;
 	OUT WILLRELE struct vnode **vpp;
 	IN struct componentname *cnp;
 	IN struct vattr *vap;
@@ -364,7 +364,7 @@ vop_abortop {
 #% inactive	vp	L U U
 #
 vop_inactive {
-	IN SHOULDBELOCKED struct vnode *vp;
+	IN SHOULDBELOCKED WILLUNLOCK struct vnode *vp;
 	IN struct proc *p;
 };