summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTom Cosgrove <tom@cvs.openbsd.org>2006-11-20 12:52:55 +0000
committerTom Cosgrove <tom@cvs.openbsd.org>2006-11-20 12:52:55 +0000
commitcf325c06e0ba4c2ac3fa08e05a3203ef06bc9b7b (patch)
tree3874449f301c145052ac82300e28e81717044aee /sys
parent4874d7283cc9633a0ac566111ceee0d34d3950ab (diff)
vprint() should be defined if DIAGNOSTIC || DEBUG. Noticed by (and
original diff from) Jake < antipsychic (at) hotmail.com >. Discussed with Mickey and Miod. ok miod@ pedro@
Diffstat (limited to 'sys')
-rw-r--r--sys/kern/vfs_subr.c6
-rw-r--r--sys/sys/vnode.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 463a0dd15da..f7973cf448f 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: vfs_subr.c,v 1.134 2006/10/30 00:34:01 thib Exp $ */
+/* $OpenBSD: vfs_subr.c,v 1.135 2006/11/20 12:52:54 tom Exp $ */
/* $NetBSD: vfs_subr.c,v 1.53 1996/04/22 01:39:13 christos Exp $ */
/*
@@ -1267,7 +1267,7 @@ loop:
return (count);
}
-#ifdef DIAGNOSTIC
+#if defined(DEBUG) || defined(DIAGNOSTIC)
/*
* Print out a description of a vnode.
*/
@@ -1312,7 +1312,7 @@ vprint(char *label, struct vnode *vp)
VOP_PRINT(vp);
}
}
-#endif /* DIAGNOSTIC */
+#endif /* DEBUG || DIAGNOSTIC */
#ifdef DEBUG
/*
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index b4e66b56719..19b61ae5ce9 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: vnode.h,v 1.71 2006/08/02 21:55:27 thib Exp $ */
+/* $OpenBSD: vnode.h,v 1.72 2006/11/20 12:52:54 tom Exp $ */
/* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */
/*
@@ -448,9 +448,7 @@ void vwakeup(struct vnode *);
void vput(struct vnode *);
int vrecycle(struct vnode *, struct simplelock *, struct proc *);
void vrele(struct vnode *);
-#ifdef DIAGNOSTIC
void vprint(char *, struct vnode *);
-#endif
/* vfs_getcwd.c */
int vfs_getcwd_scandir(struct vnode **, struct vnode **, char **, char *,