From 61a2ee28fb97e2f21d3367f28243515b159df4cf Mon Sep 17 00:00:00 2001 From: oster Date: Fri, 26 Jan 2001 04:27:16 +0000 Subject: Lots of stuff here that is only used for some of the 'fancier' RAID types. Don't compile it if we arn't going to use it. --- sys/dev/raidframe/rf_chaindecluster.c | 6 +++++- sys/dev/raidframe/rf_dagdegrd.c | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) (limited to 'sys/dev/raidframe') diff --git a/sys/dev/raidframe/rf_chaindecluster.c b/sys/dev/raidframe/rf_chaindecluster.c index da91a8d0cfd..b8e5f84e077 100644 --- a/sys/dev/raidframe/rf_chaindecluster.c +++ b/sys/dev/raidframe/rf_chaindecluster.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_chaindecluster.c,v 1.5 2001/01/26 04:14:14 oster Exp $ */ +/* $NetBSD: rf_chaindecluster.c,v 1.6 2001/01/26 04:27:16 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,6 +33,9 @@ *****************************************************************************/ #include "rf_archs.h" + +#if (RF_INCLUDE_CHAINDECLUSTER > 0) + #include "rf_types.h" #include "rf_raid.h" #include "rf_chaindecluster.h" @@ -283,3 +286,4 @@ rf_RAIDCDagSelect( } else *createFunc = (RF_VoidFuncPtr) rf_CreateRaidOneWriteDAG; } +#endif /* (RF_INCLUDE_CHAINDECLUSTER > 0) */ diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c index 3560d81fbee..7a36b3ef890 100644 --- a/sys/dev/raidframe/rf_dagdegrd.c +++ b/sys/dev/raidframe/rf_dagdegrd.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_dagdegrd.c,v 1.5 2000/01/07 03:40:57 oster Exp $ */ +/* $NetBSD: rf_dagdegrd.c,v 1.6 2001/01/26 04:27:16 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -32,6 +32,7 @@ * code for creating degraded read DAGs */ +#include "rf_archs.h" #include "rf_types.h" #include "rf_raid.h" #include "rf_dag.h" @@ -505,7 +506,7 @@ rf_CreateDegradedReadDAG( termNode->antecedents[0] = commitNode; } - +#if (RF_INCLUDE_CHAINDECLUSTER > 0) /****************************************************************************** * Create a degraded read DAG for Chained Declustering * @@ -644,6 +645,9 @@ rf_CreateRaidCDegradedReadDAG( termNode->antecedents[0] = commitNode; termNode->antType[0] = rf_control; } +#endif (RF_INCLUDE_CHAINDECLUSTER > 0) + +#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0) /* * XXX move this elsewhere? */ @@ -1121,3 +1125,5 @@ rf_DoubleDegRead( /* zero fill the target data buffers? */ } + +#endif /* (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0) */ -- cgit