rename VFSDEBUG to VFLCKDEBUG;

prompted by tedu@

7 files changed, 17 insertions, 16 deletions

diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index 842ce5ff815..b67774150c9 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.175 2011/04/06 11:17:32 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.176 2011/07/02 15:52:25 thib Exp $
 #
 #	Machine-independent option; used by all architectures for their
 #	GENERIC kernel
@@ -18,7 +18,7 @@ option		PTRACE		# ptrace(2) system call
 
 #option		KVA_GUARDPAGES	# slow virtual address recycling (+ guarding)
 option		POOL_DEBUG	# pool corruption detection 
-#option		VFSDEBUG	# VFS locking checks
+#option		VFSLCKDEBUG	# VFS locking checks
 
 option		CRYPTO		# Cryptographic framework
 
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index bbd8b34d690..411acce3010 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_subr.c,v 1.193 2010/12/21 20:14:43 thib Exp $	*/
+/*	$OpenBSD: vfs_subr.c,v 1.194 2011/07/02 15:52:25 thib Exp $	*/
 /*	$NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $	*/
 
 /*
@@ -970,7 +970,7 @@ vclean(struct vnode *vp, int flags, struct proc *p)
 	VN_KNOTE(vp, NOTE_REVOKE);
 	vp->v_tag = VT_NON;
 	vp->v_flag &= ~VXLOCK;
-#ifdef VFSDEBUG
+#ifdef VFSLCKDEBUG
 	vp->v_flag &= ~VLOCKSWORK;
 #endif
 	if (vp->v_flag & VXWANT) {
@@ -1818,7 +1818,7 @@ vinvalbuf(struct vnode *vp, int flags, struct ucred *cred, struct proc *p,
 	struct buf *nbp, *blist;
 	int s, error;
 
-#ifdef VFSDEBUG
+#ifdef VFSLCKDEBUG
 	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp))
 		panic("vinvalbuf(): vp isn't locked");
 #endif
diff --git a/sys/kern/vfs_vops.c b/sys/kern/vfs_vops.c
index 337da575cd0..8b9f6e49735 100644
--- a/sys/kern/vfs_vops.c
+++ b/sys/kern/vfs_vops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vfs_vops.c,v 1.3 2011/04/05 14:14:07 thib Exp $	*/
+/*	$OpenBSD: vfs_vops.c,v 1.4 2011/07/02 15:52:25 thib Exp $	*/
 /*
  * Copyright (c) 2010 Thordur I. Bjornsson <thib@openbsd.org> 
  *
@@ -46,7 +46,7 @@
 #include <sys/mount.h>
 #include <sys/vnode.h>
 
-#ifdef VFSDEBUG
+#ifdef VFSLCKDEBUG
 #define ASSERT_VP_ISLOCKED(vp) do {                             \
         if (((vp)->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp))   \
                 VOP_PRINT(vp);                                  \
diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c
index a25a6d9a73e..36f352035ba 100644
--- a/sys/ufs/ext2fs/ext2fs_subr.c
+++ b/sys/ufs/ext2fs/ext2fs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_subr.c,v 1.23 2010/12/21 20:14:44 thib Exp $	*/
+/*	$OpenBSD: ext2fs_subr.c,v 1.24 2011/07/02 15:52:25 thib Exp $	*/
 /*	$NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $	*/
 
 /*
@@ -162,7 +162,7 @@ ext2fs_vinit(struct mount *mp, struct vops *specops,
 			nvp->v_data = vp->v_data;
 			vp->v_data = NULL;
 			vp->v_op = &spec_vops;
-#ifdef VFSDEBUG
+#ifdef VFSLCKDEBUG
 			vp->v_flag &= ~VLOCKSWORK;
 #endif
 			vrele(vp);
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index b0cd1556cee..1bf51469039 100644
--- a/sys/ufs/ffs/ffs_vfsops.c
+++ b/sys/ufs/ffs/ffs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ffs_vfsops.c,v 1.128 2010/12/21 20:14:44 thib Exp $	*/
+/*	$OpenBSD: ffs_vfsops.c,v 1.129 2011/07/02 15:52:25 thib Exp $	*/
 /*	$NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $	*/
 
 /*
@@ -1263,7 +1263,8 @@ retry:
 		*vpp = NULL;
 		return (error);
 	}
-#ifdef VFSDEBUG
+
+#ifdef VFSLCKDEBUG
 	vp->v_flag |= VLOCKSWORK;
 #endif
 	ip = pool_get(&ffs_ino_pool, PR_WAITOK|PR_ZERO);
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 48c540604e3..a7084790b73 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ufs_vnops.c,v 1.97 2010/12/21 20:14:44 thib Exp $	*/
+/*	$OpenBSD: ufs_vnops.c,v 1.98 2011/07/02 15:52:25 thib Exp $	*/
 /*	$NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $	*/
 
 /*
@@ -1782,7 +1782,7 @@ ufs_vinit(struct mount *mntp, struct vops *specops, struct vops *fifoops,
 			nvp->v_data = vp->v_data;
 			vp->v_data = NULL;
 			vp->v_op = &spec_vops;
-#ifdef VFSDEBUG
+#ifdef VFSLCKDEBUG
 			vp->v_flag &= ~VLOCKSWORK;
 #endif
 			vrele(vp);
diff --git a/sys/uvm/uvm_vnode.c b/sys/uvm/uvm_vnode.c
index a70e6428088..a4ed3bd71d6 100644
--- a/sys/uvm/uvm_vnode.c
+++ b/sys/uvm/uvm_vnode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: uvm_vnode.c,v 1.72 2011/06/16 23:00:38 oga Exp $	*/
+/*	$OpenBSD: uvm_vnode.c,v 1.73 2011/07/02 15:52:25 thib Exp $	*/
 /*	$NetBSD: uvm_vnode.c,v 1.36 2000/11/24 20:34:01 chs Exp $	*/
 
 /*
@@ -1538,14 +1538,14 @@ uvm_vnp_uncache(struct vnode *vp)
 	uvn->u_obj.uo_refs++;		/* value is now 1 */
 	simple_unlock(&uvn->u_obj.vmobjlock);
 
-#ifdef VFSDEBUG
+#ifdef VFSLCKDEBUG
 	/*
 	 * carry over sanity check from old vnode pager: the vnode should
 	 * be VOP_LOCK'd, and we confirm it here.
 	 */
 	if ((vp->v_flag & VLOCKSWORK) && !VOP_ISLOCKED(vp))
 		panic("uvm_vnp_uncache: vnode not locked!");
-#endif	/* VFSDEBUG */
+#endif
 
 	/*
 	 * now drop our reference to the vnode.   if we have the sole