summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Martelletto <pedro@cvs.openbsd.org>2005-05-22 21:12:43 +0000
committerPedro Martelletto <pedro@cvs.openbsd.org>2005-05-22 21:12:43 +0000
commit7203758c4bc78748356bfd7cd3b33650f69afb1b (patch)
tree640d152b1733d928bee677fc1ecdf86d26fd6855
parent2578a7b7dcf8045b630a7d68496b717b8a4b6b39 (diff)
put VLOCKSWORK stuff under a single option, VFSDEBUG
-rw-r--r--sys/kern/vfs_subr.c4
-rw-r--r--sys/ufs/ffs/ffs_vfsops.c4
-rw-r--r--sys/ufs/ufs/ufs_vnops.c4
3 files changed, 6 insertions, 6 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index e1c9fdee719..7e12ba43a10 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.111 2005/05/01 12:28:18 pedro Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.112 2005/05/22 21:12:42 pedro Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -1098,7 +1098,7 @@ vclean(vp, flags, p)
simple_unlock(&vp->v_selectinfo.vsi_lock);
vp->v_tag = VT_NON;
vp->v_flag &= ~VXLOCK;
-#ifdef DIAGNOSTIC
+#ifdef VFSDEBUG
vp->v_flag &= ~VLOCKSWORK;
#endif
if (vp->v_flag & VXWANT) {
diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c
index 831954fc4f2..a891da71390 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.68 2004/08/12 07:48:53 otto Exp $ */
+/* $OpenBSD: ffs_vfsops.c,v 1.69 2005/05/22 21:12:42 pedro Exp $ */
/* $NetBSD: ffs_vfsops.c,v 1.19 1996/02/09 22:22:26 christos Exp $ */
/*
@@ -1160,7 +1160,7 @@ retry:
*vpp = NULL;
return (error);
}
-#ifdef LOCKDEBUG
+#ifdef VFSDEBUG
vp->v_flag |= VLOCKSWORK;
#endif
/* XXX - we use the same pool for ffs and mfs */
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index f220b06a412..9f91e6d2312 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.61 2005/04/23 15:13:57 pedro Exp $ */
+/* $OpenBSD: ufs_vnops.c,v 1.62 2005/05/22 21:12:42 pedro Exp $ */
/* $NetBSD: ufs_vnops.c,v 1.18 1996/05/11 18:28:04 mycroft Exp $ */
/*
@@ -2057,7 +2057,7 @@ ufs_vinit(mntp, specops, fifoops, vpp)
nvp->v_data = vp->v_data;
vp->v_data = NULL;
vp->v_op = spec_vnodeop_p;
-#ifdef DIAGNOSTIC
+#ifdef VFSDEBUG
vp->v_flag &= ~VLOCKSWORK;
#endif
vrele(vp);