[src/trunk]: src/sys/coda Move the definition of NVCODA and CODA_COMPAT_5 to ...

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

details:   https://anonhg.NetBSD.org/src/rev/24c8524d122f
branches:  trunk
changeset: 805023:24c8524d122f
user:      hannken <hannken%NetBSD.org@localhost>
date:      Sat Dec 13 15:58:39 2014 +0000

description:
Move the definition of NVCODA and CODA_COMPAT_5 to coda.h,
remove them from coda_vfsops.c and coda_psdev.c.

diffstat:

 sys/coda/coda.h        |  11 ++++++++---
 sys/coda/coda_psdev.c  |  10 ++--------
 sys/coda/coda_subr.c   |   7 ++-----
 sys/coda/coda_vfsops.c |  10 ++--------
 4 files changed, 14 insertions(+), 24 deletions(-)

diffs (105 lines):

diff -r f6b5b23043dc -r 24c8524d122f sys/coda/coda.h
--- a/sys/coda/coda.h   Sat Dec 13 15:58:13 2014 +0000
+++ b/sys/coda/coda.h   Sat Dec 13 15:58:39 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: coda.h,v 1.17 2010/08/07 20:39:33 christos Exp $ */
+/* $NetBSD: coda.h,v 1.18 2014/12/13 15:58:39 hannken Exp $ */
 
 /*
 
@@ -39,9 +39,14 @@
 #ifndef _CODA_HEADER_
 #define _CODA_HEADER_
 
-#if defined(__NetBSD__) && defined(_KERNEL_OPT)
-/* pull in optional CODA_COMPAT_5 flag */
+#if defined(__NetBSD__)
+#if defined(_KERNEL_OPT)
+/* pull in optional CODA_COMPAT_5 flag and NVCODA. */
 #include "opt_coda_compat.h"
+#include <vcoda.h>
+#else
+#define NVCODA 4
+#endif
 #endif
 
 /* Catch new _KERNEL defn for NetBSD and DJGPP/__CYGWIN32__ */
diff -r f6b5b23043dc -r 24c8524d122f sys/coda/coda_psdev.c
--- a/sys/coda/coda_psdev.c     Sat Dec 13 15:58:13 2014 +0000
+++ b/sys/coda/coda_psdev.c     Sat Dec 13 15:58:39 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: coda_psdev.c,v 1.53 2014/07/25 08:10:35 dholland Exp $ */
+/*     $NetBSD: coda_psdev.c,v 1.54 2014/12/13 15:58:39 hannken Exp $  */
 
 /*
  *
@@ -54,16 +54,10 @@
 /* These routines are the device entry points for Venus. */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.53 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_psdev.c,v 1.54 2014/12/13 15:58:39 hannken Exp $");
 
 extern int coda_nc_initialized;    /* Set if cache has been initialized */
 
-#ifndef _KERNEL_OPT
-#define        NVCODA 4
-#else
-#include <vcoda.h>
-#endif
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
diff -r f6b5b23043dc -r 24c8524d122f sys/coda/coda_subr.c
--- a/sys/coda/coda_subr.c      Sat Dec 13 15:58:13 2014 +0000
+++ b/sys/coda/coda_subr.c      Sat Dec 13 15:58:39 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: coda_subr.c,v 1.28 2014/12/13 15:57:46 hannken Exp $   */
+/*     $NetBSD: coda_subr.c,v 1.29 2014/12/13 15:58:39 hannken Exp $   */
 
 /*
  *
@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_subr.c,v 1.28 2014/12/13 15:57:46 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_subr.c,v 1.29 2014/12/13 15:58:39 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -70,9 +70,6 @@
 #include <coda/coda_subr.h>
 #include <coda/coda_namecache.h>
 
-#ifdef _KERNEL_OPT
-#include "opt_coda_compat.h"
-#endif
 
 int coda_active = 0;
 int coda_reuse = 0;
diff -r f6b5b23043dc -r 24c8524d122f sys/coda/coda_vfsops.c
--- a/sys/coda/coda_vfsops.c    Sat Dec 13 15:58:13 2014 +0000
+++ b/sys/coda/coda_vfsops.c    Sat Dec 13 15:58:39 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: coda_vfsops.c,v 1.82 2014/12/13 15:57:46 hannken Exp $ */
+/*     $NetBSD: coda_vfsops.c,v 1.83 2014/12/13 15:58:39 hannken Exp $ */
 
 /*
  *
@@ -45,13 +45,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.82 2014/12/13 15:57:46 hannken Exp $");
-
-#ifndef _KERNEL_OPT
-#define        NVCODA 4
-#else
-#include <vcoda.h>
-#endif
+__KERNEL_RCSID(0, "$NetBSD: coda_vfsops.c,v 1.83 2014/12/13 15:58:39 hannken Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>