summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2005-06-08 02:00:53 +0000
committeroster <oster@NetBSD.org>2005-06-08 02:00:53 +0000
commit77708271bf5ec4fc81810662908708c3350d64d9 (patch)
tree44f8a51604756ec87e75bcaea72791770ce97ef0 /sys/dev/raidframe
parentaf23ff4dbb3edd04b3d4b9ae31f206918ee70282 (diff)
- initialize numRUsTotal before we indicate that we are doing a reconstruct.
- make numRUsComplete and numRUsTotal 64-bit quantities like everything else that records this information.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c6
-rw-r--r--sys/dev/raidframe/rf_reconstruct.h6
2 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index 016f509e4f7..51b66c83838 100644
--- a/sys/dev/raidframe/rf_reconstruct.c
+++ b/sys/dev/raidframe/rf_reconstruct.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.c,v 1.87 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.88 2005/06/08 02:00:53 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.87 2005/02/27 00:27:45 perry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.88 2005/06/08 02:00:53 oster Exp $");
#include <sys/time.h>
#include <sys/buf.h>
@@ -601,6 +601,8 @@ rf_ContinueReconstructFailedDisk(RF_RaidReconDesc_t *reconDesc)
* the right slot */
raidPtr->reconControl = tmp_reconctrl;
mapPtr = raidPtr->reconControl->reconMap;
+ raidPtr->reconControl->numRUsTotal = mapPtr->totalRUs;
+ raidPtr->reconControl->numRUsComplete = 0;
raidPtr->status = rf_rs_reconstructing;
raidPtr->Disks[col].status = rf_ds_reconstructing;
raidPtr->Disks[col].spareCol = scol;
diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h
index 7d530d95fe1..0ee2ca0aa67 100644
--- a/sys/dev/raidframe/rf_reconstruct.h
+++ b/sys/dev/raidframe/rf_reconstruct.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconstruct.h,v 1.20 2005/02/27 00:27:45 perry Exp $ */
+/* $NetBSD: rf_reconstruct.h,v 1.21 2005/06/08 02:00:53 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -127,8 +127,8 @@ struct RF_ReconCtrl_s {
RF_StripeNum_t lastPSID;/* the ID of the last parity stripe we want
* reconstructed */
int percentComplete;/* percentage completion of reconstruction */
- int numRUsComplete; /* number of Reconstruction Units done */
- int numRUsTotal; /* total number of Reconstruction Units */
+ RF_ReconUnitCount_t numRUsComplete; /* number of Reconstruction Units done */
+ RF_ReconUnitCount_t numRUsTotal; /* total number of Reconstruction Units */
int error; /* non-0 indicates that an error has
occured during reconstruction, and
the reconstruction is in the process of