[src/trunk]: src/sys/dev/raidframe Accidentally commited some other changes t...

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

details:   https://anonhg.NetBSD.org/src/rev/226e9ca7e69d
branches:  trunk
changeset: 984976:226e9ca7e69d
user:      oster <oster%NetBSD.org@localhost>
date:      Mon Aug 02 22:37:29 2021 +0000

description:
Accidentally commited some other changes that weren't quite ready.  Add
these changes to fix the build.

diffstat:

 sys/dev/raidframe/raidframevar.h |  3 ++-
 sys/dev/raidframe/rf_raid.h      |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r b4fbac96ea38 -r 226e9ca7e69d sys/dev/raidframe/raidframevar.h
--- a/sys/dev/raidframe/raidframevar.h  Mon Aug 02 20:58:39 2021 +0000
+++ b/sys/dev/raidframe/raidframevar.h  Mon Aug 02 22:37:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: raidframevar.h,v 1.21 2019/10/10 03:43:59 christos Exp $ */
+/*     $NetBSD: raidframevar.h,v 1.22 2021/08/02 22:37:29 oster Exp $ */
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -355,6 +355,7 @@
 /* flags that can be put in the rf_recon_req structure */
 #define RF_FDFLAGS_NONE   0x0  /* just fail the disk */
 #define RF_FDFLAGS_RECON  0x1  /* fail and initiate recon */
+#define RF_FDFLAGS_RECON_FORCE  0x2    /* fail and initiate recon, ignoring errors */
 
 struct rf_recon_req {          /* used to tell the kernel to fail a disk */
        RF_RowCol_t col;
diff -r b4fbac96ea38 -r 226e9ca7e69d sys/dev/raidframe/rf_raid.h
--- a/sys/dev/raidframe/rf_raid.h       Mon Aug 02 20:58:39 2021 +0000
+++ b/sys/dev/raidframe/rf_raid.h       Mon Aug 02 22:37:29 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rf_raid.h,v 1.49 2021/07/23 00:54:45 oster Exp $       */
+/*     $NetBSD: rf_raid.h,v 1.50 2021/08/02 22:37:29 oster Exp $       */
 /*
  * Copyright (c) 1995 Carnegie-Mellon University.
  * All rights reserved.
@@ -187,6 +187,7 @@
        RF_HeadSepLimit_t headSepLimit;
        int     numFloatingReconBufs;
        int     reconInProgress;
+       int     forceRecon;
        rf_declare_cond2(waitForReconCond);     /* goes with raidPtr->mutex */
        RF_RaidReconDesc_t *reconDesc;  /* reconstruction descriptor */
        RF_ReconCtrl_t *reconControl;   /* reconstruction control structure