diff options
| author | oster <oster@NetBSD.org> | 2003-12-29 05:58:34 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2003-12-29 05:58:34 +0000 |
| commit | 8b09b35f45308f66c139211500cda97668f76778 (patch) | |
| tree | f84fdb340ea568dc5fd2e3aeaabd8b9ce25e8aeb /sys/dev/raidframe | |
| parent | 6a080d56e0ae525dd166a4abc1e00bb2b68fb246 (diff) | |
Let's see... raidPtr->recon_done_procs is never set to anything
(other than NULL when raidPtr is initialized). That means
SignalReconDone() never does anything useful. Bye-bye!
Say good-bye to recon_done_procs and recon_done_procs_mutex (and its
initializer) as well.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_driver.c | 6 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_raid.h | 5 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_reconstruct.c | 17 |
3 files changed, 6 insertions, 22 deletions
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c index 16c51ac2939..ab4193c3e3a 100644 --- a/sys/dev/raidframe/rf_driver.c +++ b/sys/dev/raidframe/rf_driver.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_driver.c,v 1.77 2003/12/29 05:52:58 oster Exp $ */ +/* $NetBSD: rf_driver.c,v 1.78 2003/12/29 05:58:34 oster Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. * All rights reserved. @@ -73,7 +73,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.77 2003/12/29 05:52:58 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.78 2003/12/29 05:58:34 oster Exp $"); #include "opt_raid_diagnostic.h" @@ -371,8 +371,6 @@ rf_Configure(raidPtr, cfgPtr, ac) raidPtr->waitForReconCond = 0; - DO_RAID_MUTEX(&raidPtr->recon_done_proc_mutex); - if (ac!=NULL) { /* We have an AutoConfig structure.. Don't do the normal disk configuration... call the auto config diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h index 83278113877..951126660bf 100644 --- a/sys/dev/raidframe/rf_raid.h +++ b/sys/dev/raidframe/rf_raid.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_raid.h,v 1.19 2003/12/29 02:38:18 oster Exp $ */ +/* $NetBSD: rf_raid.h,v 1.20 2003/12/29 05:58:34 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -239,8 +239,7 @@ struct RF_Raid_s { int numFullReconBuffers; RF_AccTraceEntry_t *recon_tracerecs; unsigned long accumXorTimeUs; - RF_ReconDoneProc_t *recon_done_procs; - RF_DECLARE_MUTEX(recon_done_proc_mutex) + /* * nAccOutstanding, waitShutdown protected by desc freelist lock * (This may seem strange, since that's a central serialization point diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c index 7f1e23cedaa..9efc0b7151f 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.58 2003/12/29 03:33:48 oster Exp $ */ +/* $NetBSD: rf_reconstruct.c,v 1.59 2003/12/29 05:58:34 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.58 2003/12/29 03:33:48 oster Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.59 2003/12/29 05:58:34 oster Exp $"); #include <sys/time.h> #include <sys/buf.h> @@ -138,18 +138,6 @@ struct RF_ReconDoneProc_s { RF_ReconDoneProc_t *next; }; -static void -SignalReconDone(RF_Raid_t * raidPtr) -{ - RF_ReconDoneProc_t *p; - - RF_LOCK_MUTEX(raidPtr->recon_done_proc_mutex); - for (p = raidPtr->recon_done_procs; p; p = p->next) { - p->proc(raidPtr, p->arg); - } - RF_UNLOCK_MUTEX(raidPtr->recon_done_proc_mutex); -} - /************************************************************************** * * sets up the parameters that will be used by the reconstruction process @@ -783,7 +771,6 @@ rf_ContinueReconstructFailedDisk(reconDesc) } - SignalReconDone(raidPtr); return (0); } /***************************************************************************** |
