diff options
| author | oster <oster@NetBSD.org> | 2004-01-01 19:32:55 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2004-01-01 19:32:55 +0000 |
| commit | f2512ce061d8cec0255542f8dc87175504ba5ff1 (patch) | |
| tree | 80ce71f43fb14aa010b03fbfa60c9583c5e7e289 /sys/dev/raidframe | |
| parent | d3aa064253bef15cd7060482a9955300cf097cb7 (diff) | |
Nuke a few more 'row'-related bits that were missed in the row-removal.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_copyback.h | 4 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconbuffer.c | 7 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.h | 4 |
3 files changed, 5 insertions, 10 deletions
diff --git a/sys/dev/raidframe/rf_copyback.h b/sys/dev/raidframe/rf_copyback.h index 6603552a9c6..600f87075c0 100644 --- a/sys/dev/raidframe/rf_copyback.h +++ b/sys/dev/raidframe/rf_copyback.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_copyback.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */ +/* $NetBSD: rf_copyback.h,v 1.5 2004/01/01 19:32:55 oster Exp $ */ /* * rf_copyback.h */ @@ -36,9 +36,7 @@ typedef struct RF_CopybackDesc_s { RF_Raid_t *raidPtr; - RF_RowCol_t frow; RF_RowCol_t fcol; - RF_RowCol_t spRow; RF_RowCol_t spCol; int status; RF_StripeNum_t stripeAddr; diff --git a/sys/dev/raidframe/rf_reconbuffer.c b/sys/dev/raidframe/rf_reconbuffer.c index 9c4bd63366b..5b947dcb269 100644 --- a/sys/dev/raidframe/rf_reconbuffer.c +++ b/sys/dev/raidframe/rf_reconbuffer.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_reconbuffer.c,v 1.15 2003/12/30 21:59:03 oster Exp $ */ +/* $NetBSD: rf_reconbuffer.c,v 1.16 2004/01/01 19:32:55 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ ***************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.15 2003/12/30 21:59:03 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.16 2004/01/01 19:32:55 oster Exp $"); #include "rf_raid.h" #include "rf_reconbuffer.h" @@ -225,7 +225,6 @@ rf_SubmitReconBufferBasic(RF_ReconBuffer_t *rbuf, int keep_it, pssPtr->flags |= RF_PSS_BUFFERWAIT; cb = rf_AllocCallbackDesc(); /* append to buf wait list in * recon ctrl structure */ - cb->row = rbuf->row; cb->col = rbuf->col; cb->callbackArg.v = rbuf->parityStripeID; cb->callbackArg2.v = rbuf->which_ru; @@ -251,12 +250,10 @@ rf_SubmitReconBufferBasic(RF_ReconBuffer_t *rbuf, int keep_it, /* initialize the buffer */ if (t != rbuf) { - t->row = rbuf->row; t->col = reconCtrlPtr->fcol; t->parityStripeID = rbuf->parityStripeID; t->which_ru = rbuf->which_ru; t->failedDiskSectorOffset = rbuf->failedDiskSectorOffset; - t->spRow = rbuf->spRow; t->spCol = rbuf->spCol; t->spOffset = rbuf->spOffset; diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h index c37e0883425..1035f6543a3 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.12 2004/01/01 19:27:36 oster Exp $ */ +/* $NetBSD: rf_reconstruct.h,v 1.13 2004/01/01 19:32:55 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -54,7 +54,7 @@ struct RF_ReconBuffer_s { int which_ru; /* which reconstruction unit within the PSS */ RF_SectorNum_t failedDiskSectorOffset; /* the offset into the failed * disk */ - RF_RowCol_t row, col; /* which disk this buffer belongs to or is + RF_RowCol_t col; /* which disk this buffer belongs to or is * targeted at */ RF_StripeCount_t count; /* counts the # of SUs installed so far */ int priority; /* used to force hi priority recon */ |
