From ecee3646ce7623c3cb59ce45fef2c49b4c083e20 Mon Sep 17 00:00:00 2001 From: "Robert V. Baron" Date: Tue, 29 Sep 1998 20:19:45 +0000 Subject: [PATCH] Fixes for lkm: 1. use VFS_LKM vs ACTUALLY_LKM_NOT_KERNEL 2. don't pass -DCODA to lkm build --- lkm/coda/Makefile | 3 +-- sys/coda/coda_fbsd.c | 6 +++--- sys/coda/coda_psdev.c | 7 +++++-- sys/coda/coda_subr.c | 9 +++++++-- sys/coda/coda_vfsops.c | 11 ++++++++--- sys/fs/coda/coda_fbsd.c | 6 +++--- sys/fs/coda/coda_psdev.c | 7 +++++-- sys/fs/coda/coda_subr.c | 9 +++++++-- sys/fs/coda/coda_vfsops.c | 11 ++++++++--- sys/modules/coda/Makefile | 3 +-- 10 files changed, 48 insertions(+), 24 deletions(-) diff --git a/lkm/coda/Makefile b/lkm/coda/Makefile index 4761a21a30eb..c014608cdfe1 100644 --- a/lkm/coda/Makefile +++ b/lkm/coda/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $ +# $Id: Makefile,v 1.1.1.1 1998/09/25 17:47:48 rvb Exp $ .PATH: ${.CURDIR}/../../sys/coda KMOD= coda_mod @@ -6,6 +6,5 @@ SRCS= coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \ coda_venus.c coda_vfsops.c coda_vnops.c NOMAN= VFS_LKM= -CFLAGS+= -DCODA .include diff --git a/sys/coda/coda_fbsd.c b/sys/coda/coda_fbsd.c index 78adcba06774..8d407ae5e696 100644 --- a/sys/coda/coda_fbsd.c +++ b/sys/coda/coda_fbsd.c @@ -27,11 +27,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_fbsd.c,v 1.5 1998/09/25 17:38:31 rvb Exp $ + * $Id: coda_fbsd.c,v 1.6 1998/09/28 20:52:57 rvb Exp $ * */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include "vcoda.h" @@ -223,7 +223,7 @@ coda_fbsd_putpages(v) SYSINIT(codadev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+VC_DEV_NO,vc_drvinit,NULL) -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #include #include diff --git a/sys/coda/coda_psdev.c b/sys/coda/coda_psdev.c index df5e3a846c26..3abbff04878a 100644 --- a/sys/coda/coda_psdev.c +++ b/sys/coda/coda_psdev.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_psdev.c,v 1.5 1998/09/25 17:38:31 rvb Exp $ + * $Id: coda_psdev.c,v 1.6 1998/09/28 20:52:58 rvb Exp $ * */ @@ -53,6 +53,9 @@ /* * HISTORY * $Log: coda_psdev.c,v $ + * Revision 1.6 1998/09/28 20:52:58 rvb + * Cleanup and fix THE bug + * * Revision 1.5 1998/09/25 17:38:31 rvb * Put "stray" printouts under DIAGNOSTIC. Make everything build * with DEBUG on. Add support for lkm. (The macro's don't work @@ -166,7 +169,7 @@ extern int coda_nc_initialized; /* Set if cache has been initialized */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c index 58620f7053ec..d24b5d602e2e 100644 --- a/sys/coda/coda_subr.c +++ b/sys/coda/coda_subr.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_subr.c,v 1.5 1998/09/13 13:57:59 rvb Exp $ + * $Id: coda_subr.c,v 1.6 1998/09/25 17:38:31 rvb Exp $ * */ @@ -46,6 +46,11 @@ /* * HISTORY * $Log: coda_subr.c,v $ + * Revision 1.6 1998/09/25 17:38:31 rvb + * Put "stray" printouts under DIAGNOSTIC. Make everything build + * with DEBUG on. Add support for lkm. (The macro's don't work + * for me; for a good chuckle look at the end of coda_fbsd.c.) + * * Revision 1.5 1998/09/13 13:57:59 rvb * Finish conversion of cfs -> coda * @@ -213,7 +218,7 @@ * 4. coda_cacheprint (under DEBUG) prints names with vnode/cnode address */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index 59df97a11ab8..835af3763e2f 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_vfsops.c,v 1.5 1998/09/13 13:57:59 rvb Exp $ + * $Id: coda_vfsops.c,v 1.6 1998/09/25 17:38:32 rvb Exp $ * */ @@ -47,6 +47,11 @@ /* * HISTORY * $Log: coda_vfsops.c,v $ + * Revision 1.6 1998/09/25 17:38:32 rvb + * Put "stray" printouts under DIAGNOSTIC. Make everything build + * with DEBUG on. Add support for lkm. (The macro's don't work + * for me; for a good chuckle look at the end of coda_fbsd.c.) + * * Revision 1.5 1998/09/13 13:57:59 rvb * Finish conversion of cfs -> coda * @@ -185,7 +190,7 @@ * */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include @@ -734,7 +739,7 @@ struct vfsops coda_vfsops = { coda_init, }; -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM /* * This case is being handled in coda_fbsd.c * What we want is too hairy for VFS_SET to get right! diff --git a/sys/fs/coda/coda_fbsd.c b/sys/fs/coda/coda_fbsd.c index 78adcba06774..8d407ae5e696 100644 --- a/sys/fs/coda/coda_fbsd.c +++ b/sys/fs/coda/coda_fbsd.c @@ -27,11 +27,11 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_fbsd.cr,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_fbsd.c,v 1.5 1998/09/25 17:38:31 rvb Exp $ + * $Id: coda_fbsd.c,v 1.6 1998/09/28 20:52:57 rvb Exp $ * */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include "vcoda.h" @@ -223,7 +223,7 @@ coda_fbsd_putpages(v) SYSINIT(codadev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+VC_DEV_NO,vc_drvinit,NULL) -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #include #include diff --git a/sys/fs/coda/coda_psdev.c b/sys/fs/coda/coda_psdev.c index df5e3a846c26..3abbff04878a 100644 --- a/sys/fs/coda/coda_psdev.c +++ b/sys/fs/coda/coda_psdev.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_psdev.c,v 1.5 1998/09/25 17:38:31 rvb Exp $ + * $Id: coda_psdev.c,v 1.6 1998/09/28 20:52:58 rvb Exp $ * */ @@ -53,6 +53,9 @@ /* * HISTORY * $Log: coda_psdev.c,v $ + * Revision 1.6 1998/09/28 20:52:58 rvb + * Cleanup and fix THE bug + * * Revision 1.5 1998/09/25 17:38:31 rvb * Put "stray" printouts under DIAGNOSTIC. Make everything build * with DEBUG on. Add support for lkm. (The macro's don't work @@ -166,7 +169,7 @@ extern int coda_nc_initialized; /* Set if cache has been initialized */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include diff --git a/sys/fs/coda/coda_subr.c b/sys/fs/coda/coda_subr.c index 58620f7053ec..d24b5d602e2e 100644 --- a/sys/fs/coda/coda_subr.c +++ b/sys/fs/coda/coda_subr.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_subr.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_subr.c,v 1.5 1998/09/13 13:57:59 rvb Exp $ + * $Id: coda_subr.c,v 1.6 1998/09/25 17:38:31 rvb Exp $ * */ @@ -46,6 +46,11 @@ /* * HISTORY * $Log: coda_subr.c,v $ + * Revision 1.6 1998/09/25 17:38:31 rvb + * Put "stray" printouts under DIAGNOSTIC. Make everything build + * with DEBUG on. Add support for lkm. (The macro's don't work + * for me; for a good chuckle look at the end of coda_fbsd.c.) + * * Revision 1.5 1998/09/13 13:57:59 rvb * Finish conversion of cfs -> coda * @@ -213,7 +218,7 @@ * 4. coda_cacheprint (under DEBUG) prints names with vnode/cnode address */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include diff --git a/sys/fs/coda/coda_vfsops.c b/sys/fs/coda/coda_vfsops.c index 59df97a11ab8..835af3763e2f 100644 --- a/sys/fs/coda/coda_vfsops.c +++ b/sys/fs/coda/coda_vfsops.c @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/cfs/coda_vfsops.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $Id: coda_vfsops.c,v 1.5 1998/09/13 13:57:59 rvb Exp $ + * $Id: coda_vfsops.c,v 1.6 1998/09/25 17:38:32 rvb Exp $ * */ @@ -47,6 +47,11 @@ /* * HISTORY * $Log: coda_vfsops.c,v $ + * Revision 1.6 1998/09/25 17:38:32 rvb + * Put "stray" printouts under DIAGNOSTIC. Make everything build + * with DEBUG on. Add support for lkm. (The macro's don't work + * for me; for a good chuckle look at the end of coda_fbsd.c.) + * * Revision 1.5 1998/09/13 13:57:59 rvb * Finish conversion of cfs -> coda * @@ -185,7 +190,7 @@ * */ -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM #define NVCODA 4 #else #include @@ -734,7 +739,7 @@ struct vfsops coda_vfsops = { coda_init, }; -#ifdef ACTUALLY_LKM_NOT_KERNEL +#ifdef VFS_LKM /* * This case is being handled in coda_fbsd.c * What we want is too hairy for VFS_SET to get right! diff --git a/sys/modules/coda/Makefile b/sys/modules/coda/Makefile index 4761a21a30eb..c014608cdfe1 100644 --- a/sys/modules/coda/Makefile +++ b/sys/modules/coda/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.6 1998/02/06 23:54:22 eivind Exp $ +# $Id: Makefile,v 1.1.1.1 1998/09/25 17:47:48 rvb Exp $ .PATH: ${.CURDIR}/../../sys/coda KMOD= coda_mod @@ -6,6 +6,5 @@ SRCS= coda_fbsd.c coda_namecache.c coda_psdev.c coda_subr.c \ coda_venus.c coda_vfsops.c coda_vnops.c NOMAN= VFS_LKM= -CFLAGS+= -DCODA .include