[src/netbsd-1-5]: src/sys/dev/raidframe Pullup 1.93->1.94. Approved by thorpej

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

details:   https://anonhg.NetBSD.org/src/rev/f416cddecf6b
branches:  netbsd-1-5
changeset: 489139:f416cddecf6b
user:      oster <oster%NetBSD.org@localhost>
date:      Sat Aug 19 19:37:19 2000 +0000

description:
Pullup 1.93->1.94.  Approved by thorpej
Don't try to initialize a component label on a failed component.

diffstat:

 sys/dev/raidframe/rf_netbsdkintf.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (30 lines):

diff -r 5a7e44d4d63f -r f416cddecf6b sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Sat Aug 19 07:55:31 2000 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Sat Aug 19 19:37:19 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_netbsdkintf.c,v 1.92.2.1 2000/07/14 17:06:45 oster Exp $    */
+/*     $NetBSD: rf_netbsdkintf.c,v 1.92.2.2 2000/08/19 19:37:19 oster Exp $    */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -1059,12 +1059,14 @@
                        ci_label.row = row;
                        for(column=0;column<raidPtr->numCol;column++) {
                                diskPtr = &raidPtr->Disks[row][column];
-                               ci_label.partitionSize = diskPtr->partitionSize;
-                               ci_label.column = column;
-                               raidwrite_component_label( 
-                                 raidPtr->Disks[row][column].dev, 
-                                 raidPtr->raid_cinfo[row][column].ci_vp, 
-                                 &ci_label );
+                               if (diskPtr->status != rf_ds_failed) {
+                                       ci_label.partitionSize = diskPtr->partitionSize;
+                                       ci_label.column = column;
+                                       raidwrite_component_label( 
+                                         raidPtr->Disks[row][column].dev, 
+                                         raidPtr->raid_cinfo[row][column].ci_vp, 
+                                         &ci_label );
+                               }
                        }
                }