Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/raidframe comment, and effectively remove, a DIAGNOS...



details:   https://anonhg.NetBSD.org/src/rev/c8c75fc33585
branches:  trunk
changeset: 777494:c8c75fc33585
user:      oster <oster%NetBSD.org@localhost>
date:      Mon Feb 20 22:42:05 2012 +0000

description:
comment, and effectively remove, a DIAGNOSTIC check that
is invalid for RAID5_RS.

diffstat:

 sys/dev/raidframe/rf_reconmap.c |  12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diffs (41 lines):

diff -r 7445b7c0be5b -r c8c75fc33585 sys/dev/raidframe/rf_reconmap.c
--- a/sys/dev/raidframe/rf_reconmap.c   Mon Feb 20 22:35:14 2012 +0000
+++ b/sys/dev/raidframe/rf_reconmap.c   Mon Feb 20 22:42:05 2012 +0000
@@ -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 @@
 
                /* 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 @@
                                panic("reconmap incorrect");
                        } 
 #endif
+#endif
                        mapPtr->low_ru++;
                        mapPtr->high_ru++;
                        /* initialize "highest" RU status entry, which



Home | Main Index | Thread Index | Old Index