summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2001-01-26 14:06:16 +0000
committeroster <oster@NetBSD.org>2001-01-26 14:06:16 +0000
commitc4a426333f2db6ada33a8b95a47669a2445c6680 (patch)
tree656445740c6282c215fdca7b94b37d7fffe73b0b /sys/dev/raidframe
parentdfd4bf046599e8623c7e38bca5fc182f0b4f446a (diff)
My.. what a twisty little maze of #defines and dependencies. Some of this
code is used for more than anticipated, and I missed a few checks last night. Thanks to Bernd Ernesti for poking me about this.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_dagdegrd.c6
-rw-r--r--sys/dev/raidframe/rf_declusterPQ.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c
index 7a36b3ef890..42a4b85fd69 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.6 2001/01/26 04:27:16 oster Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.7 2001/01/26 14:06:16 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -647,7 +647,7 @@ rf_CreateRaidCDegradedReadDAG(
}
#endif (RF_INCLUDE_CHAINDECLUSTER > 0)
-#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0)
+#if (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0) || (RF_INCLUDE_EVENODD > 0)
/*
* XXX move this elsewhere?
*/
@@ -1126,4 +1126,4 @@ rf_DoubleDegRead(
/* zero fill the target data buffers? */
}
-#endif /* (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0) */
+#endif /* (RF_INCLUDE_DECL_PQ > 0) || (RF_INCLUDE_RAID6 > 0) || (RF_INCLUDE_EVENODD > 0) */
diff --git a/sys/dev/raidframe/rf_declusterPQ.c b/sys/dev/raidframe/rf_declusterPQ.c
index e69f78b917e..52e50154de2 100644
--- a/sys/dev/raidframe/rf_declusterPQ.c
+++ b/sys/dev/raidframe/rf_declusterPQ.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_declusterPQ.c,v 1.4 2001/01/26 04:40:03 oster Exp $ */
+/* $NetBSD: rf_declusterPQ.c,v 1.5 2001/01/26 14:06:17 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -45,7 +45,7 @@
#include "rf_alloclist.h"
#include "rf_general.h"
-#if (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0)
+#if (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) || (RF_INCLUDE_EVENODD > 0)
/* configuration code */
int
@@ -487,4 +487,4 @@ rf_IdentifyStripeDeclusteredPQ(
* block design table */
*diskids = info->LayoutTable[tableOffset];
}
-#endif /* (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) */
+#endif /* (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0) || (RF_INCLUDE_EVENODD > 0) */