Rename vop_revoke, vn_bwrite, vop_noislocked, vop_nolock, vop_nounlock

to be vop_generic_revoke, vop_generic_bwrite, vop_generic_islocked,
vop_generic_lock and vop_generic_unlock.

Create vop_generic_abortop and propogate change to all file systems.

Fix PR/371.

Get rid of locking in NULLFS (should be mostly unnecessary now except for
forced unmounts).

1 files changed, 26 insertions, 10 deletions

diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c
index 66811990ef2..26c9e49a5a2 100644
--- a/sys/kern/vfs_default.c
+++ b/sys/kern/vfs_default.c
@@ -1,4 +1,4 @@
-/*       $OpenBSD: vfs_default.c,v 1.2 1998/01/11 02:10:44 csapuntz Exp $  */
+/*       $OpenBSD: vfs_default.c,v 1.3 1998/08/06 19:34:24 csapuntz Exp $  */
 
 
 /*
@@ -47,7 +47,8 @@
 #include <sys/proc.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
-
+#include <sys/namei.h>
+#include <sys/malloc.h>
 #include <miscfs/specfs/specdev.h>
 
 
@@ -58,7 +59,7 @@ extern struct simplelock spechash_slock;
  * and with all vnodes aliased to the requested vnode.
  */
 int
-vop_revoke(v)
+vop_generic_revoke(v)
 	void *v;
 {
 	struct vop_revoke_args /* {
@@ -70,7 +71,7 @@ vop_revoke(v)
 
 #ifdef DIAGNOSTIC
 	if ((ap->a_flags & REVOKEALL) == 0)
-		panic("vop_revoke");
+		panic("vop_generic_revoke");
 #endif
 
 	vp = ap->a_vp;
@@ -84,7 +85,7 @@ vop_revoke(v)
 		if (vp->v_flag & VXLOCK) {
 			vp->v_flag |= VXWANT;
 			simple_unlock(&vp->v_interlock);
-			tsleep((caddr_t)vp, PINOD, "vop_revokeall", 0);
+			tsleep((caddr_t)vp, PINOD, "vop_generic_revokeall", 0);
 			return(0);
 		}
 		/*
@@ -118,7 +119,7 @@ vop_revoke(v)
 
 
 int
-vn_bwrite(v)
+vop_generic_bwrite(v)
 	void *v;
 {
 	struct vop_bwrite_args *ap = v;
@@ -126,6 +127,21 @@ vn_bwrite(v)
 	return (bwrite(ap->a_bp));
 }
 
+
+int
+vop_generic_abortop(v)
+	void *v;
+{
+	struct vop_abortop_args /* {
+		struct vnode *a_dvp;
+		struct componentname *a_cnp;
+	} */ *ap = v;
+ 
+	if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF)
+		FREE(ap->a_cnp->cn_pnbuf, M_NAMEI);
+	return (0);
+}
+
 /*
  * Stubs to use when there is no locking to be done on the underlying object.
  * A minimal shared lock is necessary to ensure that the underlying object
@@ -133,7 +149,7 @@ vn_bwrite(v)
  * count is maintained in an auxillary vnode lock structure.
  */
 int
-vop_nolock(v)
+vop_generic_lock(v)
 	void *v;
 {
 	struct vop_lock_args /* {
@@ -181,7 +197,7 @@ vop_nolock(v)
 		return (0);
 	case LK_RELEASE:
 	default:
-		panic("vop_nolock: bad operation %d", flags & LK_TYPE_MASK);
+		panic("vop_generic_lock: bad operation %d", flags & LK_TYPE_MASK);
 	}
 	if (flags & LK_INTERLOCK)
 		vnflags |= LK_INTERLOCK;
@@ -202,7 +218,7 @@ vop_nolock(v)
  */
 
 int
-vop_nounlock(v)
+vop_generic_unlock(v)
 	void *v;
 {
 	struct vop_unlock_args /* {
@@ -222,7 +238,7 @@ vop_nounlock(v)
  * Return whether or not the node is in use.
  */
 int
-vop_noislocked(v)
+vop_generic_islocked(v)
 	void *v;
 {
 	struct vop_islocked_args /* {