Module Name: src
Committed By: oster
Date: Mon Feb 20 22:42:05 UTC 2012
Modified Files:
src/sys/dev/raidframe: rf_reconmap.c
Log Message:
comment, and effectively remove, a DIAGNOSTIC check that
is invalid for RAID5_RS.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_reconmap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_reconmap.c
diff -u src/sys/dev/raidframe/rf_reconmap.c:1.33 src/sys/dev/raidframe/rf_reconmap.c:1.34
--- src/sys/dev/raidframe/rf_reconmap.c:1.33 Wed Aug 31 18:31:02 2011
+++ src/sys/dev/raidframe/rf_reconmap.c Mon Feb 20 22:42:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconmap.c,v 1.33 2011/08/31 18:31:02 plunky Exp $ */
+/* $NetBSD: rf_reconmap.c,v 1.34 2012/02/20 22:42:05 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.33 2011/08/31 18:31:02 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.34 2012/02/20 22:42:05 oster Exp $");
#include "rf_raid.h"
#include <sys/time.h>
@@ -157,7 +157,14 @@ rf_ReconMapUpdate(RF_Raid_t *raidPtr, RF
/* do we need to move the queue? */
while (i > mapPtr->high_ru) {
+#if 0
#ifdef DIAGNOSTIC
+ /* XXX: The check below is not valid for
+ * RAID5_RS. It is valid for RAID 1 and RAID 5.
+ * The issue is that we can easily have
+ * RU_NOTHING entries here too, and those are
+ * quite correct.
+ */
if (mapPtr->status[mapPtr->head]!=RU_ALL) {
printf("\nraid%d: reconmap incorrect -- working on i %" PRIu64 "\n",
raidPtr->raidid, i);
@@ -170,6 +177,7 @@ rf_ReconMapUpdate(RF_Raid_t *raidPtr, RF
panic("reconmap incorrect");
}
#endif
+#endif
mapPtr->low_ru++;
mapPtr->high_ru++;
/* initialize "highest" RU status entry, which
