[src/netbsd-1-6]: src/sys/dev/raidframe Pullup rev 1.54 (requested by oster i...

[jmc <jmc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3b38bd7beaa0
branches:  netbsd-1-6
changeset: 531468:3b38bd7beaa0
user:      jmc <jmc%NetBSD.org@localhost>
date:      Tue Aug 31 01:20:57 2004 +0000

description:
Pullup rev 1.54 (requested by oster in ticket #1740)

rf_CheckLabels() needs to die, but for now, we patch it by setting
fatal_error when too_fatal is set, and by setting fatal_error in a
couple other critical cases.

diffstat:

 sys/dev/raidframe/rf_disks.c |  7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r fedae7f44acd -r 3b38bd7beaa0 sys/dev/raidframe/rf_disks.c
--- a/sys/dev/raidframe/rf_disks.c      Tue Aug 31 01:15:10 2004 +0000
+++ b/sys/dev/raidframe/rf_disks.c      Tue Aug 31 01:20:57 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_disks.c,v 1.38.10.1 2003/10/20 05:25:38 cyber Exp $ */
+/*     $NetBSD: rf_disks.c,v 1.38.10.2 2004/08/31 01:20:57 jmc Exp $   */
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -67,7 +67,7 @@
  ***************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.38.10.1 2003/10/20 05:25:38 cyber Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.38.10.2 2004/08/31 01:20:57 jmc Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -966,16 +966,19 @@
                   the issue... */
                hosed_row = -1;
                hosed_column = -1;
+               fatal_error = 1;
        }
 
        if (num_ser > 2) {
                printf("raid%d: Too many different serial numbers!\n", 
                       raidPtr->raidid);
+               fatal_error = 1;
        }
 
        if (num_mod > 2) {
                printf("raid%d: Too many different mod counters!\n", 
                       raidPtr->raidid);
+               fatal_error = 1;
        }
 
        /* we start by assuming the parity will be good, and flee from