Remove the simplelock argument from vrecycle();

ok pedro@, sturm@

12 files changed, 20 insertions, 31 deletions

diff --git a/share/man/man9/vrecycle.9 b/share/man/man9/vrecycle.9
index 0a57d08ed3e..43c557486f3 100644
--- a/share/man/man9/vrecycle.9
+++ b/share/man/man9/vrecycle.9
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: vrecycle.9,v 1.6 2004/04/17 20:30:41 jmc Exp $
+.\"     $OpenBSD: vrecycle.9,v 1.7 2007/04/11 16:08:50 thib Exp $
 .\"-
 .\" Copyright (c) 2002 Peter Werner
 .\" All rights reserved.
@@ -37,7 +37,6 @@
 .Ft int
 .Fo vrecycle
 .Fa "struct vnode *vp"
-.Fa "struct simplelock *inter_lkp"
 .Fa "struct proc *p"
 .Fc
 .Sh DESCRIPTION
@@ -53,18 +52,10 @@ field is zero.
 If
 .Va v_usecount
 is non-zero, it simply returns.
-If
-.Va v_usecount
-is zero and an interlock
-.Fa inter_lkp
-was passed, this interlock will be unlocked before calling
-.Xr vgonel 9 .
 .Sh RETURN VALUES
 .Fn vrecycle
 will return 1 if the vnode was placed on the free list.
-It will return 0 if the reference count was non-zero, and any lock passed in
-.Fa inter_lkp
-will still be locked.
+It will return 0 if the reference count was non-zero.
 .Sh SEE ALSO
 .Xr vgonel 9 ,
 .Xr vnode 9
diff --git a/sys/adosfs/advnops.c b/sys/adosfs/advnops.c
index a679704ca2f..3156c16b9df 100644
--- a/sys/adosfs/advnops.c
+++ b/sys/adosfs/advnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: advnops.c,v 1.34 2007/03/21 17:29:31 thib Exp $	*/
+/*	$OpenBSD: advnops.c,v 1.35 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: advnops.c,v 1.32 1996/10/13 02:52:09 christos Exp $	*/
 
 /*
@@ -943,7 +943,7 @@ adosfs_inactive(v)
 	VOP_UNLOCK(sp->a_vp, 0, sp->a_p);
 
 	if (sp->a_vp->v_usecount == 0 /* && check for file gone? */)
-		vrecycle(sp->a_vp, (struct simplelock *)0, sp->a_p);
+		vrecycle(sp->a_vp, sp->a_p);
 
 #ifdef ADOSFS_DIAGNOSTIC
 	printf(" 0)");
diff --git a/sys/isofs/cd9660/cd9660_node.c b/sys/isofs/cd9660/cd9660_node.c
index e5ed56609ec..6f97850f4bb 100644
--- a/sys/isofs/cd9660/cd9660_node.c
+++ b/sys/isofs/cd9660/cd9660_node.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cd9660_node.c,v 1.17 2007/03/21 17:29:31 thib Exp $	*/
+/*	$OpenBSD: cd9660_node.c,v 1.18 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: cd9660_node.c,v 1.17 1997/05/05 07:13:57 mycroft Exp $	*/
 
 /*-
@@ -255,7 +255,7 @@ cd9660_inactive(v)
 	 * so that it can be reused immediately.
 	 */
 	if (ip->inode.iso_mode == 0)
-		vrecycle(vp, (struct simplelock *)0, p);
+		vrecycle(vp, p);
 
 	return (error);
 }
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index cb951ea6060..0274a015389 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.141 2007/03/21 17:29:31 thib Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.142 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -1021,11 +1021,9 @@ vclean(struct vnode *vp, int flags, struct proc *p)
  * Release the passed interlock if the vnode will be recycled.
  */
 int
-vrecycle(struct vnode *vp, struct simplelock *inter_lkp, struct proc *p)
+vrecycle(struct vnode *vp, struct proc *p)
 {
 	if (vp->v_usecount == 0) {
-		if (inter_lkp)
-			simple_unlock(inter_lkp);
 		vgonel(vp, p);
 		return (1);
 	}
diff --git a/sys/msdosfs/msdosfs_denode.c b/sys/msdosfs/msdosfs_denode.c
index 92865149dff..1f9b8f44400 100644
--- a/sys/msdosfs/msdosfs_denode.c
+++ b/sys/msdosfs/msdosfs_denode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_denode.c,v 1.29 2007/03/21 17:29:32 thib Exp $	*/
+/*	$OpenBSD: msdosfs_denode.c,v 1.30 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: msdosfs_denode.c,v 1.23 1997/10/17 11:23:58 ws Exp $	*/
 
 /*-
@@ -681,6 +681,6 @@ out:
 	       dep->de_Name[0]);
 #endif
 	if (dep->de_Name[0] == SLOT_DELETED)
-		vrecycle(vp, (struct simplelock *)0, p);
+		vrecycle(vp, p);
 	return (error);
 }
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index a3cbf8b83a0..63dbbb87f97 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vnode.h,v 1.75 2007/03/21 17:29:32 thib Exp $	*/
+/*	$OpenBSD: vnode.h,v 1.76 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $	*/
 
 /*
@@ -430,7 +430,7 @@ void	vntblinit(void);
 int	vwaitforio(struct vnode *, int, char *, int);
 void	vwakeup(struct vnode *);
 void	vput(struct vnode *);
-int	vrecycle(struct vnode *, struct simplelock *, struct proc *);
+int	vrecycle(struct vnode *, struct proc *);
 void	vrele(struct vnode *);
 void	vprint(char *, struct vnode *);
 
diff --git a/sys/ufs/ext2fs/ext2fs_inode.c b/sys/ufs/ext2fs/ext2fs_inode.c
index 83f4bf967a7..7a1240593e3 100644
--- a/sys/ufs/ext2fs/ext2fs_inode.c
+++ b/sys/ufs/ext2fs/ext2fs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_inode.c,v 1.33 2006/06/18 14:18:25 pedro Exp $	*/
+/*	$OpenBSD: ext2fs_inode.c,v 1.34 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: ext2fs_inode.c,v 1.24 2001/06/19 12:59:18 wiz Exp $	*/
 
 /*
@@ -148,7 +148,7 @@ out:
 	 * so that it can be reused immediately.
 	 */
 	if (ip->i_e2din == NULL || ip->i_e2fs_dtime != 0)
-		vrecycle(vp, NULL, p);
+		vrecycle(vp, p);
 	return (error);
 }   
 
diff --git a/sys/ufs/ufs/ufs_inode.c b/sys/ufs/ufs/ufs_inode.c
index 2a9063404cd..8188f4750c0 100644
--- a/sys/ufs/ufs/ufs_inode.c
+++ b/sys/ufs/ufs/ufs_inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_inode.c,v 1.35 2006/12/28 20:33:24 thib Exp $	*/
+/*	$OpenBSD: ufs_inode.c,v 1.36 2007/04/11 16:08:50 thib Exp $	*/
 /*	$NetBSD: ufs_inode.c,v 1.7 1996/05/11 18:27:52 mycroft Exp $	*/
 
 /*
@@ -123,7 +123,7 @@ out:
 	 * so that it can be reused immediately.
 	 */
 	if (ip->i_din1 == NULL || DIP(ip, mode) == 0)
-		vrecycle(vp, NULL, p);
+		vrecycle(vp, p);
 
 	return (error);
 }
diff --git a/sys/xfs/xfs_message.c b/sys/xfs/xfs_message.c
index 7f8e59241cd..b17e04f8693 100644
--- a/sys/xfs/xfs_message.c
+++ b/sys/xfs/xfs_message.c
@@ -336,7 +336,7 @@ xfs_message_invalidnode(int fd,
 	if (vp->v_usecount == 0) {
 #ifndef __osf__
 	    NNPFSDEB(XDEBVNOPS, ("xfs_message_invalidnode: vrecycle\n"));
-	    vrecycle(vp, 0, p);
+	    vrecycle(vp, p);
 #else
 	    /* XXX */
 #endif /* __osf__ */
diff --git a/sys/xfs/xfs_vnodeops-common.c b/sys/xfs/xfs_vnodeops-common.c
index 0c223988671..ecb61f8d839 100644
--- a/sys/xfs/xfs_vnodeops-common.c
+++ b/sys/xfs/xfs_vnodeops-common.c
@@ -1027,7 +1027,7 @@ xfs_inactive_common(struct vnode *vp, d_thread_t *p)
 #ifndef __osf__
 	xfs_vfs_unlock(vp, p);
         NNPFSDEB(XDEBVNOPS, ("xfs_inactive: vrecycle\n"));
-        vrecycle(vp, 0, p);
+        vrecycle(vp, p);
 #else /* __osf__ */
 	NNPFSDEB(XDEBVNOPS, ("xfs_inactive: vp = %lx vp->v_usecount= %d\n",
 			     (unsigned long)vp, vp?vp->v_usecount:0));
diff --git a/usr.sbin/afs/src/nnpfs/bsd/nnpfs_message.c b/usr.sbin/afs/src/nnpfs/bsd/nnpfs_message.c
index 1c906fd6cf0..8a87bfde3d3 100644
--- a/usr.sbin/afs/src/nnpfs/bsd/nnpfs_message.c
+++ b/usr.sbin/afs/src/nnpfs/bsd/nnpfs_message.c
@@ -337,7 +337,7 @@ nnpfs_message_invalidnode(int fd,
 	if (vp->v_usecount == 0) {
 #ifndef __osf__
 	    NNPFSDEB(XDEBVNOPS, ("nnpfs_message_invalidnode: vrecycle\n"));
-	    vrecycle(vp, 0, p);
+	    vrecycle(vp, p);
 #else
 	    /* XXX */
 #endif /* __osf__ */
diff --git a/usr.sbin/afs/src/nnpfs/bsd/nnpfs_vnodeops-common.c b/usr.sbin/afs/src/nnpfs/bsd/nnpfs_vnodeops-common.c
index 20d80aa210b..d4f30d531ed 100644
--- a/usr.sbin/afs/src/nnpfs/bsd/nnpfs_vnodeops-common.c
+++ b/usr.sbin/afs/src/nnpfs/bsd/nnpfs_vnodeops-common.c
@@ -1017,7 +1017,7 @@ nnpfs_inactive_common(struct vnode *vp, d_thread_t *p)
 #ifndef __osf__
 	nnpfs_vfs_unlock(vp, p);
         NNPFSDEB(XDEBVNOPS, ("nnpfs_inactive: vrecycle\n"));
-        vrecycle(vp, 0, p);
+        vrecycle(vp, p);
 #else /* __osf__ */
 	NNPFSDEB(XDEBVNOPS, ("nnpfs_inactive: vp = %lx vp->v_usecount= %d\n",
 			     (unsigned long)vp, vp?vp->v_usecount:0));