diff options
| author | oster <oster@NetBSD.org> | 2002-11-19 01:49:41 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2002-11-19 01:49:41 +0000 |
| commit | 58ac277dd098871952d28b96a75e0566df48d65d (patch) | |
| tree | 3926dc2101c9b1ba4f282c8a1750ed147dbf1a88 /sys/dev/raidframe | |
| parent | 6ac4a184c40a0f7a548d823528b784b539ec27f9 (diff) | |
#if out some stuff that's only used for some distributed sparing stuff.
Shaves another 500 bytes from an i386 kernel.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_decluster.c | 7 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 7 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconutil.c | 11 |
3 files changed, 16 insertions, 9 deletions
diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c index 5ba536fda01..14b7d9f3577 100644 --- a/sys/dev/raidframe/rf_decluster.c +++ b/sys/dev/raidframe/rf_decluster.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_decluster.c,v 1.13 2002/09/23 03:27:17 oster Exp $ */ +/* $NetBSD: rf_decluster.c,v 1.14 2002/11/19 01:49:42 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -48,7 +48,7 @@ *--------------------------------------------------------------------*/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.13 2002/09/23 03:27:17 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.14 2002/11/19 01:49:42 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -647,7 +647,7 @@ rf_remap_to_spare_space( #endif /* (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) */ - +#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0) int rf_InstallSpareTable( RF_Raid_t * raidPtr, @@ -673,6 +673,7 @@ rf_InstallSpareTable( * XXX */ return (retcode); } +#endif #if (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) /* * Invoked via ioctl to install a spare table in the kernel. diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 510d6deda6a..a6d2ae5657a 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.149 2002/11/19 01:45:29 oster Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.150 2002/11/19 01:49:41 oster Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -114,7 +114,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.149 2002/11/19 01:45:29 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.150 2002/11/19 01:49:41 oster Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -1631,7 +1631,7 @@ raidinit(raidPtr) rs->sc_size = raidPtr->totalSectors; } - +#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0) /* wake up the daemon & tell it to get us a spare table * XXX * the entries in the queues should be tagged with the raidPtr @@ -1666,6 +1666,7 @@ rf_GetSpareTableFromDaemon(req) * alloc'd */ return (retcode); } +#endif /* a wrapper around rf_DoAccess that extracts appropriate info from the * bp & passes it down. diff --git a/sys/dev/raidframe/rf_reconutil.c b/sys/dev/raidframe/rf_reconutil.c index 19c53b6a80c..46e270b7c0a 100644 --- a/sys/dev/raidframe/rf_reconutil.c +++ b/sys/dev/raidframe/rf_reconutil.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconutil.c,v 1.11 2002/10/07 04:05:55 oster Exp $ */ +/* $NetBSD: rf_reconutil.c,v 1.12 2002/11/19 01:49:42 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,7 +31,7 @@ ********************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.11 2002/10/07 04:05:55 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.12 2002/11/19 01:49:42 oster Exp $"); #include <dev/raidframe/raidframevar.h> @@ -63,7 +63,10 @@ rf_MakeReconControl(reconDesc, frow, fcol, srow, scol) RF_ReconCtrl_t *reconCtrlPtr; RF_ReconBuffer_t *rbuf; RF_LayoutSW_t *lp; - int retcode, rc; +#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0) + int retcode; +#endif + int rc; RF_RowCol_t i; lp = raidPtr->Layout.map; @@ -101,6 +104,7 @@ rf_MakeReconControl(reconDesc, frow, fcol, srow, scol) numSpareRUs = 0; } +#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0) /* * Not all distributed sparing archs need dynamic mappings */ @@ -110,6 +114,7 @@ rf_MakeReconControl(reconDesc, frow, fcol, srow, scol) RF_PANIC(); /* XXX fix this */ } } +#endif /* make the reconstruction map */ reconCtrlPtr->reconMap = rf_MakeReconMap(raidPtr, (int) (layoutPtr->SUsPerRU * layoutPtr->sectorsPerStripeUnit), raidPtr->sectorsPerDisk, numSpareRUs); |
