From 9a3d9ee577a3eec80188f6c61bfff9dc7d32e9e2 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 28 Dec 1998 16:28:24 +0000 Subject: Some relatively minor tweaks to enable vinum to be built into a static kernel as a pseudo-device. The changes were: - #ifdef DEBUG -> #ifdef VINUMDEBUG - opt_vinum.h for holding above config variable - Fixing up a few stray problems where DEBUG wasn't optional. - config.c -> vinumconfig.c (there's already a config.o) - Other *.c -> vinum*.c (wasn't strictly necessary, but done in case we end up with something else conflicting later on and we might have to have yet more repository copies of files). - include file paths fixups.. (ie: get them all from the kernel tree instead of partly from the kernel and partly from /usr/include/machine) I've spoken with Greg about this.. I hope this doesn't mess him around too much.. --- sys/dev/vinum/Makefile | 4 ++-- sys/dev/vinum/request.h | 6 +++--- sys/dev/vinum/vinum.c | 9 +++++---- sys/dev/vinum/vinumconfig.c | 5 +++-- sys/dev/vinum/vinumext.h | 6 +++--- sys/dev/vinum/vinumhdr.h | 20 +++++++++++++++----- sys/dev/vinum/vinuminterrupt.c | 11 ++++++----- sys/dev/vinum/vinumio.c | 6 ++++-- sys/dev/vinum/vinumio.h | 8 ++++---- sys/dev/vinum/vinumioctl.c | 15 +++++++++------ sys/dev/vinum/vinumkw.h | 8 ++++++-- sys/dev/vinum/vinumlock.c | 5 +++-- sys/dev/vinum/vinummemory.c | 11 ++++++----- sys/dev/vinum/vinumparser.c | 18 +++++++++++------- sys/dev/vinum/vinumrequest.c | 17 +++++++++-------- sys/dev/vinum/vinumrevive.c | 7 ++++--- sys/dev/vinum/vinumstate.c | 7 ++++--- sys/dev/vinum/vinumutil.c | 9 ++++++--- sys/dev/vinum/vinumvar.h | 8 ++++---- 19 files changed, 107 insertions(+), 73 deletions(-) diff --git a/sys/dev/vinum/Makefile b/sys/dev/vinum/Makefile index 28e6429..363aa7a 100644 --- a/sys/dev/vinum/Makefile +++ b/sys/dev/vinum/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 1998/09/28 04:21:20 grog Exp $ +# $Id: Makefile,v 1.4 1998/12/28 04:56:22 peter Exp $ .PATH: ${.CURDIR}/../../sys/dev/ccd KMOD= vinum_mod @@ -7,7 +7,7 @@ SRCS= vinum.c vinum.h vnode_if.h parser.c config.c io.c util.c vinumhdr.h requ vinumstate.h vinumvar.h revive.c vinumioctl.c interrupt.c NOMAN= PSEUDO_LKM= -CFLAGS = -I${.CURDIR} -O -g -I/usr/include/machine -DDEBUG -Wall -Wno-unused -Wno-parentheses +CFLAGS = -I${.CURDIR} -O -g -DVINUMDEBUG -Wall -Wno-unused -Wno-parentheses CLEANFILES+= vinum.h vnode_if.h vnode_if.c diff --git a/sys/dev/vinum/request.h b/sys/dev/vinum/request.h index 81fafd2..c8defba 100644 --- a/sys/dev/vinum/request.h +++ b/sys/dev/vinum/request.h @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: request.h,v 1.2 1998/10/21 08:32:32 grog Exp $ + * $Id: request.h,v 1.4 1998/12/28 04:56:23 peter Exp $ */ /* Information needed to set up a transfer */ @@ -57,7 +57,7 @@ enum xferinfo { XFR_PARITY_BLOCK = 0x80, /* parity block in request */ XFR_BAD_SUBDISK = 0x100, /* this subdisk is dead */ XFR_MALLOCED = 0x200, /* this buffer is malloced */ -#if DEBUG +#if VINUMDEBUG XFR_PHASE2 = 0x800, /* documentation only: 2nd phase write */ #endif XFR_REVIVECONFLICT = 0x1000, /* possible conflict with a revive operation */ @@ -158,7 +158,7 @@ enum requeststatus { REQUEST_ENOMEM /* ran out of memory */ }; -#ifdef DEBUG +#ifdef VINUMDEBUG /* Trace entry for request info (DEBUG_LASTREQS) */ enum rqinfo_type { loginfo_unused, /* never been used */ diff --git a/sys/dev/vinum/vinum.c b/sys/dev/vinum/vinum.c index 49a60de..a25a47f 100644 --- a/sys/dev/vinum/vinum.c +++ b/sys/dev/vinum/vinum.c @@ -33,15 +33,16 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinum.c,v 1.3 1998/11/03 06:38:58 grog Exp $ + * $Id: vinum.c,v 1.5 1998/12/28 04:56:24 peter Exp $ */ #define STATIC /* nothing while we're testing XXX */ #define REALLYKERNEL -#include "vinumhdr.h" -#include "sys/sysproto.h" /* for sync(2) */ -#ifdef DEBUG +#include "opt_vinum.h" +#include +#include /* for sync(2) */ +#ifdef VINUMDEBUG #include int debug = 0; #endif diff --git a/sys/dev/vinum/vinumconfig.c b/sys/dev/vinum/vinumconfig.c index 5b9abc3..0a66f91 100644 --- a/sys/dev/vinum/vinumconfig.c +++ b/sys/dev/vinum/vinumconfig.c @@ -44,13 +44,14 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: config.c,v 1.4 1998/11/03 06:37:14 grog Exp $ + * $Id: config.c,v 1.6 1998/12/28 04:56:22 peter Exp $ */ #define STATIC /* nothing while we're testing XXX */ #define REALLYKERNEL -#include "vinumhdr.h" +#include "opt_vinum.h" +#include extern jmp_buf command_fail; /* return on a failed command */ diff --git a/sys/dev/vinum/vinumext.h b/sys/dev/vinum/vinumext.h index ab1d143..a82fa1b 100644 --- a/sys/dev/vinum/vinumext.h +++ b/sys/dev/vinum/vinumext.h @@ -33,14 +33,14 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumext.h,v 1.2 1998/10/21 08:32:32 grog Exp $ + * $Id: vinumext.h,v 1.4 1998/12/28 04:56:24 peter Exp $ */ /* vinumext.h: external definitions */ extern struct _vinum_conf vinum_conf; /* configuration information */ -#ifdef DEBUG +#ifdef VINUMDEBUG extern debug; /* debug flags */ #endif @@ -136,7 +136,7 @@ int launch_requests(struct request *rq, int reviveok); /* XXX Do we need this? */ int vinumpart(dev_t); -#ifdef DEBUG +#ifdef VINUMDEBUG /* Memory allocation and request tracing */ void vinum_meminfo(caddr_t data); int vinum_mallocinfo(caddr_t data); diff --git a/sys/dev/vinum/vinumhdr.h b/sys/dev/vinum/vinumhdr.h index af86c61..92259c6 100644 --- a/sys/dev/vinum/vinumhdr.h +++ b/sys/dev/vinum/vinumhdr.h @@ -36,7 +36,7 @@ */ /* Header files used by all modules */ -/* $Id: vinumhdr.h,v 1.2 1998/11/06 01:34:06 peter Exp $ */ +/* $Id: vinumhdr.h,v 1.4 1998/12/28 04:56:24 peter Exp $ */ #ifdef KERNEL #define REALLYKERNEL @@ -72,8 +72,13 @@ #include #include #include +#ifdef KERNEL +#include +#include +#else #include #include +#endif #include #ifdef USES_VM /* XXX Do we need this? */ @@ -85,18 +90,23 @@ #include /* #include */ #endif /* USES_VM */ -#include -#include -#include "vinumkw.h" -#include "vinumext.h" +#include +#include +#include +#include #undef Free /* defined in some funny net stuff */ #ifdef REALLYKERNEL +#ifdef VINUMDEBUG #define Malloc(x) MMalloc ((x), __FILE__, __LINE__) /* show where we came from */ #define Free(x) FFree ((x), __FILE__, __LINE__) /* show where we came from */ caddr_t MMalloc (int size, char *, int); void FFree (void *mem, char *, int); #else +#define Malloc(x) malloc((x), M_DEVBUF, M_WAITOK) +#define Free(x) free((x), M_DEVBUF) +#endif +#else #define Malloc(x) malloc ((x)) /* just the size */ #define Free(x) free ((x)) /* just the address */ #endif diff --git a/sys/dev/vinum/vinuminterrupt.c b/sys/dev/vinum/vinuminterrupt.c index b97ec3e..5f11e18 100644 --- a/sys/dev/vinum/vinuminterrupt.c +++ b/sys/dev/vinum/vinuminterrupt.c @@ -35,12 +35,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: interrupt.c,v 1.3 1998/11/03 06:37:57 grog Exp $ + * $Id: interrupt.c,v 1.5 1998/12/28 04:56:23 peter Exp $ */ #define REALLYKERNEL -#include "vinumhdr.h" -#include "request.h" +#include "opt_vinum.h" +#include +#include #include #include @@ -71,7 +72,7 @@ complete_rqe(struct buf *bp) rq = rqg->rq; /* and the complete request */ ubp = rq->bp; /* user buffer */ -#ifdef DEBUG +#ifdef VINUMDEBUG if (debug & DEBUG_LASTREQS) logrq(loginfo_iodone, rqe, ubp); #endif @@ -107,7 +108,7 @@ complete_rqe(struct buf *bp) if (rqg->active == 0) /* request group finished, */ rq->active--; /* one less */ if (rq->active == 0) { /* request finished, */ -#if DEBUG +#if VINUMDEBUG if (debug & DEBUG_RESID) { if (ubp->b_resid != 0) /* still something to transfer? */ Debugger("resid"); diff --git a/sys/dev/vinum/vinumio.c b/sys/dev/vinum/vinumio.c index e61cf0c..436e362 100644 --- a/sys/dev/vinum/vinumio.c +++ b/sys/dev/vinum/vinumio.c @@ -33,17 +33,19 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: io.c,v 1.3 1998/11/03 06:38:26 grog Exp $ + * $Id: io.c,v 1.5 1998/12/28 04:56:23 peter Exp $ */ #define STATIC /* nothing while we're testing XXX */ +#include "opt_vinum.h" + #if __FreeBSD__ < 3 /* this is in sys/disklabel.h in 3.0 and on */ #define DTYPE_VINUM 12 /* vinum volume */ #endif #define REALLYKERNEL -#include "vinumhdr.h" +#include #include extern jmp_buf command_fail; /* return on a failed command */ diff --git a/sys/dev/vinum/vinumio.h b/sys/dev/vinum/vinumio.h index 3487192..d915885 100644 --- a/sys/dev/vinum/vinumio.h +++ b/sys/dev/vinum/vinumio.h @@ -33,10 +33,10 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumio.h,v 1.2 1998/10/21 08:32:32 grog Exp $ + * $Id: vinumio.h,v 1.4 1998/12/28 04:56:24 peter Exp $ */ -#ifdef DEBUG +#ifdef VINUMDEBUG #define MAX_IOCTL_REPLY 4096 #else #define MAX_IOCTL_REPLY 256 @@ -62,7 +62,7 @@ struct _ioctl_reply { #define VINUM_SAVECONFIG _IOC(0, L, 72, 0) /* release locks, update, write config to disk */ #define VINUM_RESETCONFIG _IOC(0, L, 73, 0) /* trash config on disk */ #define VINUM_INIT _IOC(0, L, 74, 0) /* read config from disk */ -#ifdef DEBUG +#ifdef VINUMDEBUG struct debuginfo { int changeit; @@ -136,6 +136,6 @@ struct vinum_rename_msg { #define VINUM_RENAME _IOC(IOC_IN | IOC_OUT, L, 89, MAX_IOCTL_REPLY) /* reset object stats */ #define VINUM_REPLACE _IOC(IOC_IN | IOC_OUT, L, 90, MAX_IOCTL_REPLY) /* reset object stats */ -#ifdef DEBUG +#ifdef VINUMDEBUG #define VINUM_RQINFO _IOWR(L, 91, struct rqinfo) /* get request info [i] from trace buffer */ #endif diff --git a/sys/dev/vinum/vinumioctl.c b/sys/dev/vinum/vinumioctl.c index 5c2d8ec..60ffd25 100644 --- a/sys/dev/vinum/vinumioctl.c +++ b/sys/dev/vinum/vinumioctl.c @@ -35,17 +35,18 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumioctl.c,v 1.2 1998/10/21 08:32:32 grog Exp $ + * $Id: vinumioctl.c,v 1.4 1998/12/28 04:56:24 peter Exp $ */ #define STATIC /* nothing while we're testing XXX */ #define REALLYKERNEL -#include "vinumhdr.h" -#include "sys/sysproto.h" /* for sync(2) */ -#ifdef DEBUG +#include "opt_vinum.h" +#include +#include /* for sync(2) */ +#ifdef VINUMDEBUG #include -#include "request.h" +#include #endif jmp_buf command_fail; /* return on a failed command */ @@ -98,7 +99,7 @@ vinumioctl(dev_t dev, if (error) /* bombed out */ return 0; /* the reply will contain meaningful info */ switch (cmd) { -#ifdef DEBUG +#ifdef VINUMDEBUG case VINUM_DEBUG: if (((struct debuginfo *) data)->changeit) /* change debug settings */ debug = (((struct debuginfo *) data)->param); @@ -220,6 +221,7 @@ vinumioctl(dev_t dev, setstate((struct vinum_ioctl_msg *) data); /* set an object state */ return 0; +#ifdef VINUMDEBUG case VINUM_MEMINFO: vinum_meminfo(data); return 0; @@ -229,6 +231,7 @@ vinumioctl(dev_t dev, case VINUM_RQINFO: return vinum_rqinfo(data); +#endif case VINUM_LABEL: /* label a volume */ ioctl_reply->error = write_volume_label(*(int *) data); /* index of the volume to label */ diff --git a/sys/dev/vinum/vinumkw.h b/sys/dev/vinum/vinumkw.h index 2ffd362..6668751 100644 --- a/sys/dev/vinum/vinumkw.h +++ b/sys/dev/vinum/vinumkw.h @@ -33,9 +33,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumkw.h,v 1.2 1998/10/21 08:32:32 grog Exp $ + * $Id: vinumkw.h,v 1.4 1998/12/28 04:56:24 peter Exp $ */ +#ifdef KERNEL +#include "opt_vinum.h" +#endif + /* Command keywords that vinum knows. These include both user-level * and kernel-level stuff */ @@ -96,7 +100,7 @@ enum keyword { kw_printconfig, kw_replace, kw_detached, -#ifdef DEBUG +#ifdef VINUMDEBUG kw_debug, /* go into debugger */ #endif kw_info, diff --git a/sys/dev/vinum/vinumlock.c b/sys/dev/vinum/vinumlock.c index 9376364..a979408 100644 --- a/sys/dev/vinum/vinumlock.c +++ b/sys/dev/vinum/vinumlock.c @@ -33,11 +33,12 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: lock.c,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $ + * $Id: lock.c,v 1.3 1998/12/28 04:56:23 peter Exp $ */ #define REALLYKERNEL -#include "vinumhdr.h" +#include "opt_vinum.h" +#include /* Lock routines. Currently, we lock either an individual volume * or the global configuration. I don't think tsleep and diff --git a/sys/dev/vinum/vinummemory.c b/sys/dev/vinum/vinummemory.c index e1ecd0e..af1eafb 100644 --- a/sys/dev/vinum/vinummemory.c +++ b/sys/dev/vinum/vinummemory.c @@ -33,17 +33,18 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: memory.c,v 1.2 1998/10/21 08:32:32 grog Exp $ + * $Id: memory.c,v 1.4 1998/12/28 04:56:23 peter Exp $ */ #define REALLYKERNEL +#include "opt_vinum.h" #define USES_VM -#include "vinumhdr.h" +#include extern jmp_buf command_fail; /* return on a failed command */ -#ifdef DEBUG -#include "request.h" +#ifdef VINUMDEBUG +#include extern struct rqinfo rqinfo[]; extern struct rqinfo *rqip; #endif @@ -73,7 +74,7 @@ expand_table(void **table, int oldsize, int newsize) } } -#if DEBUG /* XXX debug */ +#if VINUMDEBUG /* XXX debug */ #define MALLOCENTRIES 16384 int malloccount = 0; int highwater = 0; /* highest index ever allocated */ diff --git a/sys/dev/vinum/vinumparser.c b/sys/dev/vinum/vinumparser.c index 1dc425c..6c63ac7 100644 --- a/sys/dev/vinum/vinumparser.c +++ b/sys/dev/vinum/vinumparser.c @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: parser.c,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $ + * $Id: parser.c,v 1.3 1998/12/28 04:56:23 peter Exp $ */ /* This file contains the parser for the configuration routines. It's used @@ -52,6 +52,10 @@ * Error conditions are end of line before end of quote, or no space after * a closing quote. In this case, tokenize() returns -1. */ +#ifdef KERNEL +#include "opt_vinum.h" +#endif + #include #ifdef KERNEL #undef KERNEL /* XXX */ @@ -68,12 +72,12 @@ #include #include #include -#include "sys/buf.h" +#include -#include -#include "vinumkw.h" -#include "vinumio.h" -#include "vinumext.h" +#include +#include +#include +#include #ifdef REALLYKERNEL #define isspace(c) ((c == ' ') || (c == '\t')) /* check for white space */ @@ -116,7 +120,7 @@ struct _keywords keywords[] = keypair(rename), keypair(detached), #ifndef KERNEL /* for vinum(8) only */ -#ifdef DEBUG +#ifdef VINUMDEBUG keypair(debug), #endif keypair(attach), diff --git a/sys/dev/vinum/vinumrequest.c b/sys/dev/vinum/vinumrequest.c index 79c5253..e98bcf4 100644 --- a/sys/dev/vinum/vinumrequest.c +++ b/sys/dev/vinum/vinumrequest.c @@ -37,12 +37,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: request.c,v 1.3 1998/11/02 04:09:34 grog Exp $ + * $Id: request.c,v 1.5 1998/12/28 04:56:23 peter Exp $ */ #define REALLYKERNEL -#include "vinumhdr.h" -#include "request.h" +#include "opt_vinum.h" +#include +#include #include #include @@ -73,7 +74,7 @@ int vinum_bounds_check(struct buf *bp, struct volume *vol); caddr_t allocdatabuf(struct rqelement *rqe); void freedatabuf(struct rqelement *rqe); -#ifdef DEBUG +#ifdef VINUMDEBUG struct rqinfo rqinfo[RQINFO_SIZE]; struct rqinfo *rqip = rqinfo; @@ -204,7 +205,7 @@ vinumstart(struct buf *bp, int reviveok) int rqno; /* index in request list */ enum requeststatus status; -#if DEBUG +#if VINUMDEBUG if (debug & DEBUG_LASTREQS) logrq(loginfo_user_bp, bp, bp); #endif @@ -372,7 +373,7 @@ launch_requests(struct request *rq, int reviveok) abortrequest(rq, EINVAL); return -1; } -#if DEBUG +#if VINUMDEBUG if (debug & DEBUG_ADDRESSES) printf("Request: %x\n%s dev 0x%x, offset 0x%x, length %ld\n", (u_int) rq, @@ -397,7 +398,7 @@ launch_requests(struct request *rq, int reviveok) if ((rqe->b.b_flags & B_READ) == 0) rqe->b.b_vp->v_numoutput++; /* one more output going */ rqe->b.b_flags |= B_ORDERED; /* XXX chase SCSI driver */ -#if DEBUG +#if VINUMDEBUG if (debug & DEBUG_ADDRESSES) printf(" %s dev 0x%x, sd %d, offset 0x%x, devoffset 0x%x, length %ld\n", rqe->b.b_flags & B_READ ? "Read" : "Write", @@ -833,7 +834,7 @@ sdio(struct buf *bp) } if ((sbp->b.b_flags & B_READ) == 0) /* write */ sbp->b.b_vp->v_numoutput++; /* one more output going */ -#if DEBUG +#if VINUMDEBUG if (debug & DEBUG_ADDRESSES) printf(" %s dev 0x%x, sd %d, offset 0x%x, devoffset 0x%x, length %ld\n", sbp->b.b_flags & B_READ ? "Read" : "Write", diff --git a/sys/dev/vinum/vinumrevive.c b/sys/dev/vinum/vinumrevive.c index 75000d8..1ecee9f 100644 --- a/sys/dev/vinum/vinumrevive.c +++ b/sys/dev/vinum/vinumrevive.c @@ -33,12 +33,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: revive.c,v 1.3 1998/11/02 04:10:19 grog Exp $ + * $Id: revive.c,v 1.5 1998/12/28 04:56:23 peter Exp $ */ #define REALLYKERNEL -#include "vinumhdr.h" -#include "request.h" +#include "opt_vinum.h" +#include +#include /* revive a block of a plex. Return an error * indication. EAGAIN means successful copy, but diff --git a/sys/dev/vinum/vinumstate.c b/sys/dev/vinum/vinumstate.c index 8117c53..eea83e1 100644 --- a/sys/dev/vinum/vinumstate.c +++ b/sys/dev/vinum/vinumstate.c @@ -33,12 +33,13 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: state.c,v 1.3 1998/11/02 04:10:45 grog Exp $ + * $Id: state.c,v 1.5 1998/12/28 04:56:23 peter Exp $ */ #define REALLYKERNEL -#include "vinumhdr.h" -#include "request.h" +#include "opt_vinum.h" +#include +#include /* Update drive state */ /* Return 1 if the state changes, otherwise 0 */ diff --git a/sys/dev/vinum/vinumutil.c b/sys/dev/vinum/vinumutil.c index 84cfabc..0b5ef0f 100644 --- a/sys/dev/vinum/vinumutil.c +++ b/sys/dev/vinum/vinumutil.c @@ -33,13 +33,16 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: util.c,v 1.1.1.1 1998/09/16 05:56:21 grog Exp $ + * $Id: util.c,v 1.3 1998/12/28 04:56:24 peter Exp $ */ /* This file contains utility routines used both in kernel and user context */ -#include "vinumhdr.h" -#include "statetexts.h" +#ifdef KERNEL +#include "opt_vinum.h" +#endif +#include +#include #ifndef REALLYKERNEL #include extern jmp_buf command_fail; /* return on a failed command */ diff --git a/sys/dev/vinum/vinumvar.h b/sys/dev/vinum/vinumvar.h index a7e7e2f..bca7f77 100644 --- a/sys/dev/vinum/vinumvar.h +++ b/sys/dev/vinum/vinumvar.h @@ -33,7 +33,7 @@ * otherwise) arising in any way out of the use of this software, even if * advised of the possibility of such damage. * - * $Id: vinumvar.h,v 1.3 1998/11/02 04:11:16 grog Exp $ + * $Id: vinumvar.h,v 1.5 1998/12/28 04:56:24 peter Exp $ */ /* XXX gdb can't find our global pointers, so use this kludge to @@ -41,7 +41,7 @@ #define BROKEN_GDB struct _vinum_conf *VC = &vinum_conf #include -#include "vinumstate.h" +#include /* Some configuration maxima. They're an enum because * we can't define global constants. Sorry about that. * @@ -212,7 +212,7 @@ struct _vinum_conf { int flags; int opencount; /* number of times we've been opened */ -#if DEBUG +#if VINUMDEBUG int lastrq; struct buf *lastbuf; struct rqinfo **rqipp; @@ -506,7 +506,7 @@ enum setstateflags { setstate_noupdate = 16 /* don't update config */ }; -#ifdef DEBUG +#ifdef VINUMDEBUG /* Debugging stuff */ #define DEBUG_ADDRESSES 1 #define DEBUG_NUMOUTPUT 2 -- cgit v1.1