Remove the 'waslocked' parameter to vfs_object_create().

6 files changed, 24 insertions, 48 deletions

diff --git a/sys/kern/vfs_export.c b/sys/kern/vfs_export.c
index 9b7e241..0d5bbdc 100644
--- a/sys/kern/vfs_export.c
+++ b/sys/kern/vfs_export.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.178 1999/01/02 11:34:55 bde Exp $
+ * $Id: vfs_subr.c,v 1.179 1999/01/05 18:12:29 eivind Exp $
  */
 
 /*
@@ -510,7 +510,7 @@ getnewvnode(tag, mp, vops, vpp)
 	vp->v_data = 0;
 	splx(s);
 
-	vfs_object_create(vp, p, p->p_ucred, TRUE);
+	vfs_object_create(vp, p, p->p_ucred);
 	return (0);
 }
 
@@ -2499,27 +2499,20 @@ loop:
  * afford the additional metadata buffering capability of the
  * VMIO code by making the device node be VMIO mode also.
  *
- * If !waslocked, must be called with interlock.
+ * vp must be locked when vfs_object_create is called.
  */
 int
-vfs_object_create(vp, p, cred, waslocked)
+vfs_object_create(vp, p, cred)
 	struct vnode *vp;
 	struct proc *p;
 	struct ucred *cred;
-	int waslocked;
 {
 	struct vattr vat;
 	vm_object_t object;
 	int error = 0;
 
-	if ((vp->v_type != VREG) && (vp->v_type != VBLK)) {
-		if (!waslocked)
-			simple_unlock(&vp->v_interlock);
+	if ((vp->v_type != VREG) && (vp->v_type != VBLK))
 		return 0;
-	}
-
-	if (!waslocked) 
-		vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY, p);
 
 retry:
 	if ((object = vp->v_object) == NULL) {
@@ -2547,16 +2540,10 @@ retry:
 		}
 	}
 
-	if (vp->v_object) {
+	if (vp->v_object)
 		vp->v_flag |= VOBJBUF;
-	}
 
 retn:
-	if (!waslocked) {
-		simple_lock(&vp->v_interlock);
-		VOP_UNLOCK(vp, LK_INTERLOCK, p);
-	}
-
 	return error;
 }
 
diff --git a/sys/kern/vfs_extattr.c b/sys/kern/vfs_extattr.c
index 5f2b992..18e39d6 100644
--- a/sys/kern/vfs_extattr.c
+++ b/sys/kern/vfs_extattr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.110 1998/11/03 14:29:09 peter Exp $
+ * $Id: vfs_syscalls.c,v 1.111 1998/12/12 21:07:09 dillon Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -976,7 +976,7 @@ open(p, uap)
 		fp->f_flag |= FHASLOCK;
 	}
 	if ((vp->v_type == VREG) && (vp->v_object == NULL))
-		vfs_object_create(vp, p, p->p_ucred, TRUE);
+		vfs_object_create(vp, p, p->p_ucred);
 	VOP_UNLOCK(vp, 0, p);
 	p->p_retval[0] = indx;
 	return (0);
diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c
index b2d0954..3a00557 100644
--- a/sys/kern/vfs_lookup.c
+++ b/sys/kern/vfs_lookup.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_lookup.c	8.4 (Berkeley) 2/16/94
- * $Id: vfs_lookup.c,v 1.27 1998/04/08 18:31:57 wosch Exp $
+ * $Id: vfs_lookup.c,v 1.28 1998/06/07 17:11:45 dfr Exp $
  */
 
 #include "opt_ktrace.h"
@@ -168,9 +168,11 @@ namei(ndp)
 
 			if (ndp->ni_vp && ndp->ni_vp->v_type == VREG &&
 				(cnp->cn_nameiop != DELETE) &&
-				((cnp->cn_flags & (NOOBJ|LOCKLEAF)) == LOCKLEAF))
+				((cnp->cn_flags & (NOOBJ|LOCKLEAF)) ==
+				 LOCKLEAF))
 				vfs_object_create(ndp->ni_vp,
-					ndp->ni_cnd.cn_proc, ndp->ni_cnd.cn_cred, 1);
+					ndp->ni_cnd.cn_proc,
+					ndp->ni_cnd.cn_cred);
 
 			return (0);
 		}
@@ -698,7 +700,7 @@ relookup(dvp, vpp, cnp)
 
 	if (dp->v_type == VREG &&
 		((cnp->cn_flags & (NOOBJ|LOCKLEAF)) == LOCKLEAF))
-		vfs_object_create(dp, cnp->cn_proc, cnp->cn_cred, 1);
+		vfs_object_create(dp, cnp->cn_proc, cnp->cn_cred);
 
 	if ((cnp->cn_flags & LOCKLEAF) == 0)
 		VOP_UNLOCK(dp, 0, p);
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 9b7e241..0d5bbdc 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_subr.c	8.31 (Berkeley) 5/26/95
- * $Id: vfs_subr.c,v 1.178 1999/01/02 11:34:55 bde Exp $
+ * $Id: vfs_subr.c,v 1.179 1999/01/05 18:12:29 eivind Exp $
  */
 
 /*
@@ -510,7 +510,7 @@ getnewvnode(tag, mp, vops, vpp)
 	vp->v_data = 0;
 	splx(s);
 
-	vfs_object_create(vp, p, p->p_ucred, TRUE);
+	vfs_object_create(vp, p, p->p_ucred);
 	return (0);
 }
 
@@ -2499,27 +2499,20 @@ loop:
  * afford the additional metadata buffering capability of the
  * VMIO code by making the device node be VMIO mode also.
  *
- * If !waslocked, must be called with interlock.
+ * vp must be locked when vfs_object_create is called.
  */
 int
-vfs_object_create(vp, p, cred, waslocked)
+vfs_object_create(vp, p, cred)
 	struct vnode *vp;
 	struct proc *p;
 	struct ucred *cred;
-	int waslocked;
 {
 	struct vattr vat;
 	vm_object_t object;
 	int error = 0;
 
-	if ((vp->v_type != VREG) && (vp->v_type != VBLK)) {
-		if (!waslocked)
-			simple_unlock(&vp->v_interlock);
+	if ((vp->v_type != VREG) && (vp->v_type != VBLK))
 		return 0;
-	}
-
-	if (!waslocked) 
-		vn_lock(vp, LK_EXCLUSIVE | LK_INTERLOCK | LK_RETRY, p);
 
 retry:
 	if ((object = vp->v_object) == NULL) {
@@ -2547,16 +2540,10 @@ retry:
 		}
 	}
 
-	if (vp->v_object) {
+	if (vp->v_object)
 		vp->v_flag |= VOBJBUF;
-	}
 
 retn:
-	if (!waslocked) {
-		simple_lock(&vp->v_interlock);
-		VOP_UNLOCK(vp, LK_INTERLOCK, p);
-	}
-
 	return error;
 }
 
diff --git a/sys/kern/vfs_syscalls.c b/sys/kern/vfs_syscalls.c
index 5f2b992..18e39d6 100644
--- a/sys/kern/vfs_syscalls.c
+++ b/sys/kern/vfs_syscalls.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_syscalls.c	8.13 (Berkeley) 4/15/94
- * $Id: vfs_syscalls.c,v 1.110 1998/11/03 14:29:09 peter Exp $
+ * $Id: vfs_syscalls.c,v 1.111 1998/12/12 21:07:09 dillon Exp $
  */
 
 /* For 4.3 integer FS ID compatibility */
@@ -976,7 +976,7 @@ open(p, uap)
 		fp->f_flag |= FHASLOCK;
 	}
 	if ((vp->v_type == VREG) && (vp->v_object == NULL))
-		vfs_object_create(vp, p, p->p_ucred, TRUE);
+		vfs_object_create(vp, p, p->p_ucred);
 	VOP_UNLOCK(vp, 0, p);
 	p->p_retval[0] = indx;
 	return (0);
diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c
index 2b73bcc..756c945 100644
--- a/sys/kern/vfs_vnops.c
+++ b/sys/kern/vfs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)vfs_vnops.c	8.2 (Berkeley) 1/21/94
- * $Id: vfs_vnops.c,v 1.59 1998/06/27 06:43:09 phk Exp $
+ * $Id: vfs_vnops.c,v 1.60 1998/11/02 02:36:16 peter Exp $
  */
 
 #include <sys/param.h>
@@ -172,7 +172,7 @@ vn_open(ndp, fmode, cmode)
 	 * Make sure that a VM object is created for VMIO support.
 	 */
 	if (vp->v_type == VREG) {
-		if ((error = vfs_object_create(vp, p, cred, 1)) != 0)
+		if ((error = vfs_object_create(vp, p, cred)) != 0)
 			goto bad;
 	}