Module Name: src
Committed By: hannken
Date: Sat Dec 13 15:58:39 UTC 2014
Modified Files:
src/sys/coda: coda.h coda_psdev.c coda_subr.c coda_vfsops.c
Log Message:
Move the definition of NVCODA and CODA_COMPAT_5 to coda.h,
remove them from coda_vfsops.c and coda_psdev.c.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/coda/coda.h
cvs rdiff -u -r1.53 -r1.54 src/sys/coda/coda_psdev.c
cvs rdiff -u -r1.28 -r1.29 src/sys/coda/coda_subr.c
cvs rdiff -u -r1.82 -r1.83 src/sys/coda/coda_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/coda/coda.h
diff -u src/sys/coda/coda.h:1.17 src/sys/coda/coda.h:1.18
--- src/sys/coda/coda.h:1.17 Sat Aug 7 20:39:33 2010
+++ src/sys/coda/coda.h Sat Dec 13 15:58:39 2014
@@ -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 @@ Mellon the rights to redistribute these
#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__ */
Index: src/sys/coda/coda_psdev.c
diff -u src/sys/coda/coda_psdev.c:1.53 src/sys/coda/coda_psdev.c:1.54
--- src/sys/coda/coda_psdev.c:1.53 Fri Jul 25 08:10:35 2014
+++ src/sys/coda/coda_psdev.c Sat Dec 13 15:58:39 2014
@@ -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>
Index: src/sys/coda/coda_subr.c
diff -u src/sys/coda/coda_subr.c:1.28 src/sys/coda/coda_subr.c:1.29
--- src/sys/coda/coda_subr.c:1.28 Sat Dec 13 15:57:46 2014
+++ src/sys/coda/coda_subr.c Sat Dec 13 15:58:39 2014
@@ -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 @@ __KERNEL_RCSID(0, "$NetBSD: coda_subr.c,
#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;
Index: src/sys/coda/coda_vfsops.c
diff -u src/sys/coda/coda_vfsops.c:1.82 src/sys/coda/coda_vfsops.c:1.83
--- src/sys/coda/coda_vfsops.c:1.82 Sat Dec 13 15:57:46 2014
+++ src/sys/coda/coda_vfsops.c Sat Dec 13 15:58:39 2014
@@ -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>
