[src/netbsd-1-4]: src/sys/dev/raidframe Pull up revision 1.6 (requested by os...

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

details:   https://anonhg.NetBSD.org/src/rev/9f91f4ebddb9
branches:  netbsd-1-4
changeset: 469861:9f91f4ebddb9
user:      he <he%NetBSD.org@localhost>
date:      Thu Dec 16 22:42:17 1999 +0000

description:
Pull up revision 1.6 (requested by oster):
  Trust only the data disk if the mirror is not known to
  be up-to-date.

diffstat:

 sys/dev/raidframe/rf_dagutils.c |  17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)

diffs (32 lines):

diff -r 7c31479b2a1b -r 9f91f4ebddb9 sys/dev/raidframe/rf_dagutils.c
--- a/sys/dev/raidframe/rf_dagutils.c   Thu Dec 16 22:30:49 1999 +0000
+++ b/sys/dev/raidframe/rf_dagutils.c   Thu Dec 16 22:42:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_dagutils.c,v 1.3.2.1 1999/11/09 21:54:58 he Exp $   */
+/*     $NetBSD: rf_dagutils.c,v 1.3.2.2 1999/12/16 22:42:17 he Exp $   */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -1274,12 +1274,17 @@
        } else
                if (RF_DEAD_DISK(disks[rowData][colData].status)) {
                        usemirror = 1;
-               } else
-                       if (data_pda->startSector < (disks[rowData][colData].numBlocks / 2)) {
+               } else 
+                       if (raidPtr->parity_good == RF_RAID_DIRTY) {
+                               /* Trust only the main disk */
                                usemirror = 0;
-                       } else {
-                               usemirror = 1;
-                       }
+                       } else
+                               if (data_pda->startSector < 
+                                   (disks[rowData][colData].numBlocks / 2)) {
+                                       usemirror = 0;
+                               } else {
+                                       usemirror = 1;
+                               }
 
        if (usemirror) {
                /* use mirror (parity) disk, swap params 0 & 4 */