CVS commit: src/sys/dev/raidframe

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Fri Jan 13 13:01:13 UTC 2017

Modified Files:
        src/sys/dev/raidframe: rf_disks.c

Log Message:
more faithful to the original (from coypu)


To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/raidframe/rf_disks.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_disks.c
diff -u src/sys/dev/raidframe/rf_disks.c:1.88 src/sys/dev/raidframe/rf_disks.c:1.89
--- src/sys/dev/raidframe/rf_disks.c:1.88	Thu Jan 12 23:22:16 2017
+++ src/sys/dev/raidframe/rf_disks.c	Fri Jan 13 08:01:13 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: rf_disks.c,v 1.88 2017/01/13 04:22:16 christos Exp $	*/
+/*	$NetBSD: rf_disks.c,v 1.89 2017/01/13 13:01:13 christos Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -60,7 +60,7 @@
  ***************************************************************/
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.88 2017/01/13 04:22:16 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.89 2017/01/13 13:01:13 christos Exp $");
 
 #include <dev/raidframe/raidframevar.h>
 
@@ -701,16 +701,17 @@ static int rf_check_label_vitals(RF_Raid
 
 
 static void
-rf_handle_hosed(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr, int hosed_column)
+rf_handle_hosed(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr, int hosed_column,
+    int again)
 {
 	printf("Hosed component: %s\n", &cfgPtr->devnames[0][hosed_column][0]);
 	if (!cfgPtr->force)
 		return;
 
 	/* we'll fail this component, as if there are
-	   other major errors, we arn't forcing things
+	   other major errors, we aren't forcing things
 	   and we'll abort the config anyways */
-	if (raidPtr->Disks[hosed_column].status == rf_ds_failed)
+	if (again && raidPtr->Disks[hosed_column].status == rf_ds_failed)
 		return;
 
 	raidPtr->Disks[hosed_column].status = rf_ds_failed;
@@ -840,7 +841,8 @@ rf_CheckLabels(RF_Raid_t *raidPtr, RF_Co
 				}
 			}
 			if (hosed_column != -1)
-				rf_handle_hosed(raidPtr, cfgPtr, hosed_column);
+				rf_handle_hosed(raidPtr, cfgPtr, hosed_column,
+				    0);
 		} else {
 			too_fatal = 1;
 		}
@@ -897,7 +899,8 @@ rf_CheckLabels(RF_Raid_t *raidPtr, RF_Co
 				}
 			}
 			if (hosed_column != -1)
-				rf_handle_hosed(raidPtr, cfgPtr, hosed_column);
+				rf_handle_hosed(raidPtr, cfgPtr, hosed_column,
+				    1);
 		} else {
 			too_fatal = 1;
 		}