[src/netbsd-1-4]: src/sys/miscfs/nullfs Pull up rev. 1.13->1.14, approved by ...

[wrstuden <wrstuden%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0343bfcad801
branches:  netbsd-1-4
changeset: 468250:0343bfcad801
user:      wrstuden <wrstuden%NetBSD.org@localhost>
date:      Thu Apr 15 23:10:42 1999 +0000

description:
Pull up rev. 1.13->1.14, approved by Curt. Change a diagnostic message
in nullfs_node_create to only be emitted ifdef NULLFS_DIAGNOSTIC and
no longer if DEBUG or DIAGNOSTIC. Now matches all other diagnostic
messages in nullfs.

diffstat:

 sys/miscfs/nullfs/null_subr.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 5fcdb8fd8e4b -r 0343bfcad801 sys/miscfs/nullfs/null_subr.c
--- a/sys/miscfs/nullfs/null_subr.c     Thu Apr 15 21:38:11 1999 +0000
+++ b/sys/miscfs/nullfs/null_subr.c     Thu Apr 15 23:10:42 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: null_subr.c,v 1.13 1998/09/30 06:50:10 jonathan Exp $  */
+/*     $NetBSD: null_subr.c,v 1.13.6.1 1999/04/15 23:10:42 wrstuden Exp $      */
 
 /*
  * Copyright (c) 1992, 1993
@@ -303,7 +303,7 @@
        if (takelock) {
                if (!locked)
                        vn_lock(aliasvp, LK_EXCLUSIVE | LK_RETRY);
-#if defined(DIAGNOSTIC) || defined(DEBUG) || defined(NULLFS_DIAGNOSTIC)
+#ifdef NULLFS_DIAGNOSTIC
                else
                        printf ("null_node_create: already locked\n");
 #endif