diff options
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_callback.h | 7 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_raid1.c | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconbuffer.c | 5 |
3 files changed, 6 insertions, 11 deletions
diff --git a/sys/dev/raidframe/rf_callback.h b/sys/dev/raidframe/rf_callback.h index 35cc40a85e1..9ab0bbbc8e0 100644 --- a/sys/dev/raidframe/rf_callback.h +++ b/sys/dev/raidframe/rf_callback.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_callback.h,v 1.4 2001/10/04 15:58:51 oster Exp $ */ +/* $NetBSD: rf_callback.h,v 1.5 2004/03/03 13:29:00 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -50,10 +50,7 @@ struct RF_CallbackDesc_s { void (*callbackFunc) (RF_CBParam_t); /* function to call */ RF_CBParam_t callbackArg; /* args to give to function, or just * info about this callback */ - RF_CBParam_t callbackArg2; - RF_RowCol_t row; /* disk row and column IDs to give to the - * callback func */ - RF_RowCol_t col; + RF_RowCol_t col; /* column IDs to give to the callback func */ RF_CallbackDesc_t *next;/* next entry in list */ }; diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c index cab6c63047e..67718722448 100644 --- a/sys/dev/raidframe/rf_raid1.c +++ b/sys/dev/raidframe/rf_raid1.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid1.c,v 1.21 2004/03/03 00:45:20 oster Exp $ */ +/* $NetBSD: rf_raid1.c,v 1.22 2004/03/03 13:29:00 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -33,7 +33,7 @@ *****************************************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.21 2004/03/03 00:45:20 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.22 2004/03/03 13:29:00 oster Exp $"); #include "rf_raid.h" #include "rf_raid1.h" @@ -638,7 +638,6 @@ rf_SubmitReconBufferRAID1(RF_ReconBuffer_t *rbuf, int keep_it, cb = rf_AllocCallbackDesc(); cb->col = rbuf->col; cb->callbackArg.v = rbuf->parityStripeID; - cb->callbackArg2.v = rbuf->which_ru; cb->next = NULL; if (reconCtrlPtr->bufferWaitList == NULL) { /* we are the wait list- lucky us */ diff --git a/sys/dev/raidframe/rf_reconbuffer.c b/sys/dev/raidframe/rf_reconbuffer.c index 1d701d4b8db..ce1d2e1294b 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.19 2004/03/03 00:45:20 oster Exp $ */ +/* $NetBSD: rf_reconbuffer.c,v 1.20 2004/03/03 13:29:00 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.19 2004/03/03 00:45:20 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.20 2004/03/03 13:29:00 oster Exp $"); #include "rf_raid.h" #include "rf_reconbuffer.h" @@ -229,7 +229,6 @@ rf_SubmitReconBufferBasic(RF_ReconBuffer_t *rbuf, int keep_it, * recon ctrl structure */ cb->col = rbuf->col; cb->callbackArg.v = rbuf->parityStripeID; - cb->callbackArg2.v = rbuf->which_ru; cb->next = NULL; if (!reconCtrlPtr->bufferWaitList) reconCtrlPtr->bufferWaitList = cb; |
