diff options
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.c | 8 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.h | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_revent.c | 11 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_revent.h | 6 |
4 files changed, 10 insertions, 21 deletions
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index a7b7fe9f273..1976069759d 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.76 2004/03/18 16:54:54 oster Exp $ */ +/* $NetBSD: rf_reconstruct.c,v 1.77 2004/11/15 17:16:28 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.76 2004/03/18 16:54:54 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.77 2004/11/15 17:16:28 oster Exp $"); #include <sys/time.h> #include <sys/buf.h> @@ -636,7 +636,7 @@ rf_ContinueReconstructFailedDisk(RF_RaidReconDesc_t *reconDesc) while (reconDesc->numDisksDone < raidPtr->numCol - 1) { - event = rf_GetNextReconEvent(reconDesc, (void (*) (void *)) rf_ContinueReconstructFailedDisk, reconDesc); + event = rf_GetNextReconEvent(reconDesc); RF_ASSERT(event); if (ProcessReconEvent(raidPtr, event)) @@ -670,7 +670,7 @@ rf_ContinueReconstructFailedDisk(RF_RaidReconDesc_t *reconDesc) while (rf_UnitsLeftToReconstruct(raidPtr->reconControl->reconMap) > 0) { - event = rf_GetNextReconEvent(reconDesc, (void (*) (void *)) rf_ContinueReconstructFailedDisk, reconDesc); + event = rf_GetNextReconEvent(reconDesc); RF_ASSERT(event); (void) ProcessReconEvent(raidPtr, event); /* ignore return code */ diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h index 4600e4a7768..b90c4081551 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.17 2004/03/18 16:54:54 oster Exp $ */ +/* $NetBSD: rf_reconstruct.h,v 1.18 2004/11/15 17:16:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -165,10 +165,6 @@ struct RF_ReconCtrl_s { /* performance monitoring */ struct timeval starttime; /* recon start time */ - - void (*continueFunc) (void *); /* function to call when io - * returns */ - void *continueArg; /* argument for Func */ }; /* the default priority for reconstruction accesses */ #define RF_IO_RECON_PRIORITY RF_IO_LOW_PRIORITY diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c index 7871a16bf03..7eedb697de1 100644 --- a/sys/dev/raidframe/rf_revent.c +++ b/sys/dev/raidframe/rf_revent.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_revent.c,v 1.18 2004/03/07 22:15:19 oster Exp $ */ +/* $NetBSD: rf_revent.c,v 1.19 2004/11/15 17:16:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.18 2004/03/07 22:15:19 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.19 2004/11/15 17:16:28 oster Exp $"); #include <sys/errno.h> @@ -73,8 +73,7 @@ rf_ConfigureReconEvent(RF_ShutdownList_t **listp) * or will return an event if it is not */ RF_ReconEvent_t * -rf_GetNextReconEvent(RF_RaidReconDesc_t *reconDesc, - void (*continueFunc)(void *), void *continueArg) +rf_GetNextReconEvent(RF_RaidReconDesc_t *reconDesc) { RF_Raid_t *raidPtr = reconDesc->raidPtr; RF_ReconCtrl_t *rctrl = raidPtr->reconControl; @@ -84,10 +83,6 @@ rf_GetNextReconEvent(RF_RaidReconDesc_t *reconDesc, /* q null and count==0 must be equivalent conditions */ RF_ASSERT((rctrl->eventQueue == NULL) == (rctrl->eq_count == 0)); - rctrl->continueFunc = continueFunc; - rctrl->continueArg = continueArg; - - /* mpsleep timeout value: secs = timo_val/hz. 'ticks' here is defined as cycle-counter ticks, not softclock ticks */ diff --git a/sys/dev/raidframe/rf_revent.h b/sys/dev/raidframe/rf_revent.h index 9f464fcae8d..5d3d68b2b53 100644 --- a/sys/dev/raidframe/rf_revent.h +++ b/sys/dev/raidframe/rf_revent.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_revent.h,v 1.6 2003/12/29 02:38:18 oster Exp $ */ +/* $NetBSD: rf_revent.h,v 1.7 2004/11/15 17:16:28 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -39,9 +39,7 @@ int rf_ConfigureReconEvent(RF_ShutdownList_t ** listp); -RF_ReconEvent_t *rf_GetNextReconEvent(RF_RaidReconDesc_t * reconDesc, - void (*continueFunc) (void *), - void *continueArg); +RF_ReconEvent_t *rf_GetNextReconEvent(RF_RaidReconDesc_t * reconDesc); void rf_CauseReconEvent(RF_Raid_t * raidPtr, RF_RowCol_t col, void *arg, RF_Revent_t type); |
