CVS commit: src/sys/miscfs/deadfs

[Juergen Hannken-Illjes]

Module Name:    src
Committed By:   hannken
Date:           Fri Jul  2 07:58:10 UTC 2010

Modified Files:
        src/sys/miscfs/deadfs: dead_vnops.c

Log Message:
LK_INTERLOCK is no longer a valid flag for VOP_LOCK().


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/sys/miscfs/deadfs/dead_vnops.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/miscfs/deadfs/dead_vnops.c
diff -u src/sys/miscfs/deadfs/dead_vnops.c:1.48 src/sys/miscfs/deadfs/dead_vnops.c:1.49
--- src/sys/miscfs/deadfs/dead_vnops.c:1.48	Sat Mar 14 21:04:24 2009
+++ src/sys/miscfs/deadfs/dead_vnops.c	Fri Jul  2 07:58:09 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: dead_vnops.c,v 1.48 2009/03/14 21:04:24 dsl Exp $	*/
+/*	$NetBSD: dead_vnops.c,v 1.49 2010/07/02 07:58:09 hannken Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.48 2009/03/14 21:04:24 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dead_vnops.c,v 1.49 2010/07/02 07:58:09 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,7 +70,7 @@
 int	dead_getpages(void *);
 #define dead_putpages	genfs_null_putpages
 
-int	chkvnlock(struct vnode *, bool);
+int	chkvnlock(struct vnode *);
 int	dead_default_error(void *);
 
 int (**dead_vnodeop_p)(void *);
@@ -135,7 +135,7 @@
 		kauth_cred_t a_cred;
 	} */ *ap = v;
 
-	if (chkvnlock(ap->a_vp, false))
+	if (chkvnlock(ap->a_vp))
 		panic("dead_read: lock");
 	/*
 	 * Return EOF for tty devices, EIO for others
@@ -159,7 +159,7 @@
 		kauth_cred_t a_cred;
 	} */ *ap = v;
 
-	if (chkvnlock(ap->a_vp, false))
+	if (chkvnlock(ap->a_vp))
 		panic("dead_write: lock");
 	return (EIO);
 }
@@ -180,7 +180,7 @@
 		struct lwp *a_l;
 	} */ *ap = v;
 
-	if (!chkvnlock(ap->a_vp, false))
+	if (!chkvnlock(ap->a_vp))
 		return (EBADF);
 	return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap));
 }
@@ -213,7 +213,7 @@
 		struct buf *a_bp;
 	} */ *ap = v;
 	struct buf *bp;
-	if (ap->a_vp == NULL || !chkvnlock(ap->a_vp, false)) {
+	if (ap->a_vp == NULL || !chkvnlock(ap->a_vp)) {
 		bp = ap->a_bp;
 		bp->b_error = EIO;
 		bp->b_resid = bp->b_bcount;
@@ -234,14 +234,8 @@
 		int a_flags;
 		struct proc *a_p;
 	} */ *ap = v;
-	bool interlock;
 
-	if (ap->a_flags & LK_INTERLOCK) {
-		interlock = true;
-		ap->a_flags &= ~LK_INTERLOCK;
-	} else
-		interlock = false;
-	if (!chkvnlock(ap->a_vp, interlock))
+	if (!chkvnlock(ap->a_vp))
 		return (0);
 	return (VCALL(ap->a_vp, VOFFSET(vop_lock), ap));
 }
@@ -260,7 +254,7 @@
 		int *a_runp;
 	} */ *ap = v;
 
-	if (!chkvnlock(ap->a_vp, false))
+	if (!chkvnlock(ap->a_vp))
 		return (EIO);
 	return (VOP_BMAP(ap->a_vp, ap->a_bn, ap->a_vpp, ap->a_bnp, ap->a_runp));
 }
@@ -301,12 +295,11 @@
  * in a state of change.
  */
 int
-chkvnlock(struct vnode *vp, bool interlock)
+chkvnlock(struct vnode *vp)
 {
 	int locked = 0;
 
-	if (!interlock)
-		mutex_enter(&vp->v_interlock);
+	mutex_enter(&vp->v_interlock);
 	while (vp->v_iflag & VI_XLOCK) {
 		vwait(vp, VI_XLOCK);
 		locked = 1;