[src/netbsd-1-4]: src/sys/dev/raidframe pullup 1.8->1.9 (oster)

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

details:   https://anonhg.NetBSD.org/src/rev/bc3000213120
branches:  netbsd-1-4
changeset: 468922:bc3000213120
user:      perry <perry%NetBSD.org@localhost>
date:      Wed Jun 23 14:36:57 1999 +0000

description:
pullup 1.8->1.9 (oster)

diffstat:

 sys/dev/raidframe/rf_disks.c |  33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diffs (76 lines):

diff -r 3699a5244562 -r bc3000213120 sys/dev/raidframe/rf_disks.c
--- a/sys/dev/raidframe/rf_disks.c      Wed Jun 23 14:34:27 1999 +0000
+++ b/sys/dev/raidframe/rf_disks.c      Wed Jun 23 14:36:57 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_disks.c,v 1.8 1999/03/18 03:02:38 oster Exp $       */
+/*     $NetBSD: rf_disks.c,v 1.8.2.1 1999/06/23 14:36:57 perry Exp $   */
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -692,10 +692,12 @@
                                /* we'll fail this component, as if there are
                                   other major errors, we arn't forcing things
                                   and we'll abort the config anyways */
-                               raidPtr->Disks[hosed_row][hosed_column].status
-                                       = rf_ds_failed;
-                               raidPtr->numFailures++;
-                               raidPtr->status[hosed_row] = rf_rs_degraded;
+                               if (raidPtr->Disks[hosed_row][hosed_column].status != rf_ds_failed) {
+                                       raidPtr->Disks[hosed_row][hosed_column].status
+                                               = rf_ds_failed;
+                                       raidPtr->numFailures++;
+                                       raidPtr->status[hosed_row] = rf_rs_degraded;
+                               }
                        }
                } else {
                        too_fatal = 1;
@@ -765,7 +767,11 @@
        return(fatal_error);    
 }
 
-
+int config_disk_queue(RF_Raid_t *, RF_DiskQueue_t *, RF_RowCol_t, 
+                     RF_RowCol_t, RF_DiskQueueSW_t *,
+                     RF_SectorCount_t, dev_t, int, 
+                     RF_ShutdownList_t **,
+                     RF_AllocListElem_t *);
 int rf_add_hot_spare(RF_Raid_t *, RF_SingleComponent_t *);
 int
 rf_add_hot_spare(raidPtr, sparePtr)
@@ -773,6 +779,7 @@
        RF_SingleComponent_t *sparePtr;
 {
        RF_RaidDisk_t *disks;
+       RF_DiskQueue_t *spareQueues;
        int ret;
        unsigned int bs;
        int spare_number;
@@ -783,7 +790,7 @@
                RF_ERRORMSG1("Too many spares: %d\n", raidPtr->numSpare);
                return(EINVAL);
        }
-       
+
        /* the beginning of the spares... */
        disks = &raidPtr->Disks[0][raidPtr->numCol];
 
@@ -835,8 +842,18 @@
                }
        }
 
+       spareQueues = &raidPtr->Queues[0][raidPtr->numCol];
+       ret = config_disk_queue( raidPtr, &spareQueues[spare_number],
+                                0, raidPtr->numCol + spare_number, 
+                                raidPtr->Queues[0][0].qPtr, /* XXX */
+                                raidPtr->sectorsPerDisk,
+                                raidPtr->Disks[0][raidPtr->numCol + spare_number].dev,
+                                raidPtr->Queues[0][0].maxOutstanding, /* XXX */
+                                &raidPtr->shutdownList,
+                                raidPtr->cleanupList);
+                                
+
        raidPtr->numSpare++;
-
        return (0);
 
 fail: