Move the definition of NVCODA and CODA_COMPAT_5 to coda.h,

remove them from coda_vfsops.c and coda_psdev.c.
This commit is contained in:
hannken 2014-12-13 15:58:39 +00:00
parent b0c8ff749a
commit 58ab4a9584
4 changed files with 14 additions and 24 deletions

View File

@ -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 changes without encumbrance.
#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__ */

View File

@ -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>

View File

@ -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,v 1.28 2014/12/13 15:57:46 hannken Exp $
#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;

View File

@ -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>