summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2004-01-01 19:27:35 +0000
committeroster <oster@NetBSD.org>2004-01-01 19:27:35 +0000
commitd3aa064253bef15cd7060482a9955300cf097cb7 (patch)
treee195a6baf8cf397ca1e9b1de3dc613c55dfbf1a8 /sys/dev
parent2becc547c70b7d92c62f9da271239c86fcdf0308 (diff)
Nuke a bunch of unused variables:
- node_queue_cond - quiescent_cond - eq_cond - desc->cond - desc->head - diskqueue->numWaiting Nuke rf_print_unable_to_init_cond(). Nuke rf_TerminateDiskQueues prototype from rf_diskqueue.h.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/raidframe/rf_desc.h4
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c5
-rw-r--r--sys/dev/raidframe/rf_diskqueue.h6
-rw-r--r--sys/dev/raidframe/rf_driver.c14
-rw-r--r--sys/dev/raidframe/rf_engine.c5
-rw-r--r--sys/dev/raidframe/rf_general.h3
-rw-r--r--sys/dev/raidframe/rf_raid.h4
-rw-r--r--sys/dev/raidframe/rf_reconstruct.h4
-rw-r--r--sys/dev/raidframe/rf_reconutil.c5
9 files changed, 13 insertions, 37 deletions
diff --git a/sys/dev/raidframe/rf_desc.h b/sys/dev/raidframe/rf_desc.h
index 258c31e0406..e7021c5388b 100644
--- a/sys/dev/raidframe/rf_desc.h
+++ b/sys/dev/raidframe/rf_desc.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_desc.h,v 1.8 2003/12/29 02:38:17 oster Exp $ */
+/* $NetBSD: rf_desc.h,v 1.9 2004/01/01 19:27:35 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -96,10 +96,8 @@ struct RF_RaidAccessDesc_s {
* end of the access */
RF_RaidAccessDesc_t *next;
- RF_RaidAccessDesc_t *head;
RF_DECLARE_MUTEX(mutex) /* these are used to implement blocking I/O */
- RF_DECLARE_COND(cond)
int async_flag;
RF_Etimer_t timer; /* used for timing this access */
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index f3700adec4b..b4b3aef6c10 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.c,v 1.28 2003/12/31 02:47:58 oster Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.29 2004/01/01 19:27:35 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -66,7 +66,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.28 2003/12/31 02:47:58 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.29 2004/01/01 19:27:35 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -172,7 +172,6 @@ rf_ConfigureDiskQueue(RF_Raid_t *raidPtr, RF_DiskQueue_t *diskqueue,
diskqueue->maxOutstanding = maxOutstanding;
diskqueue->curPriority = RF_IO_NORMAL_PRIORITY;
diskqueue->nextLockingOp = NULL;
- diskqueue->numWaiting = 0;
diskqueue->flags = 0;
diskqueue->raidPtr = raidPtr;
diskqueue->rf_cinfo = &raidPtr->raid_cinfo[c];
diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h
index e3ebd6c88fd..520f8f9c473 100644
--- a/sys/dev/raidframe/rf_diskqueue.h
+++ b/sys/dev/raidframe/rf_diskqueue.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_diskqueue.h,v 1.13 2003/12/29 02:38:17 oster Exp $ */
+/* $NetBSD: rf_diskqueue.h,v 1.14 2004/01/01 19:27:36 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -118,8 +118,6 @@ struct RF_DiskQueue_s {
* arrived at the head of the
* queue & is waiting for
* drainage */
- int numWaiting; /* number of threads waiting on this variable.
- * user-level only */
RF_DiskQueueFlags_t flags; /* terminate, locked */
RF_Raid_t *raidPtr; /* associated array */
dev_t dev; /* device number for kernel version */
@@ -152,8 +150,6 @@ struct RF_DiskQueue_s {
int rf_ConfigureDiskQueueSystem(RF_ShutdownList_t ** listp);
-void rf_TerminateDiskQueues(RF_Raid_t * raidPtr);
-
int
rf_ConfigureDiskQueues(RF_ShutdownList_t ** listp, RF_Raid_t * raidPtr,
RF_Config_t * cfgPtr);
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index f615c390599..14a32a7b10f 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.80 2003/12/30 19:28:26 oster Exp $ */
+/* $NetBSD: rf_driver.c,v 1.81 2004/01/01 19:27:36 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.80 2003/12/30 19:28:26 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.81 2004/01/01 19:27:36 oster Exp $");
#include "opt_raid_diagnostic.h"
@@ -357,7 +357,6 @@ rf_Configure(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr, RF_AutoConfig_t *ac)
raidPtr->waitShutdown = 0;
DO_RAID_MUTEX(&raidPtr->access_suspend_mutex);
- raidPtr->quiescent_cond = 0;
raidPtr->waitForReconCond = 0;
@@ -460,7 +459,6 @@ rf_AllocRaidAccDesc(RF_Raid_t *raidPtr, RF_IoType_t type,
desc = pool_get(&rf_rad_pool, PR_WAITOK);
simple_lock_init(&desc->mutex);
- desc->cond = 0;
if (raidPtr->waitShutdown) {
/*
@@ -493,7 +491,6 @@ rf_AllocRaidAccDesc(RF_Raid_t *raidPtr, RF_IoType_t type,
desc->callbackFunc = NULL;
desc->callbackArg = NULL;
desc->next = NULL;
- desc->head = desc;
desc->cleanupList = NULL;
rf_MakeAllocList(desc->cleanupList);
return (desc);
@@ -906,13 +903,6 @@ rf_print_unable_to_init_mutex(char *file, int line, int rc)
}
void
-rf_print_unable_to_init_cond(char *file, int line, int rc)
-{
- RF_ERRORMSG3("Unable to init cond file %s line %d rc=%d\n",
- file, line, rc);
-}
-
-void
rf_print_unable_to_add_shutdown(char *file, int line, int rc)
{
RF_ERRORMSG3("Unable to add to shutdown list file %s line %d rc=%d\n",
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index b4244906f76..1177234f204 100644
--- a/sys/dev/raidframe/rf_engine.c
+++ b/sys/dev/raidframe/rf_engine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_engine.c,v 1.29 2003/12/30 21:59:03 oster Exp $ */
+/* $NetBSD: rf_engine.c,v 1.30 2004/01/01 19:27:36 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -55,7 +55,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.29 2003/12/30 21:59:03 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.30 2004/01/01 19:27:36 oster Exp $");
#include <sys/errno.h>
@@ -128,7 +128,6 @@ rf_ConfigureEngine(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
int rc;
rf_mutex_init(&raidPtr->node_queue_mutex);
- raidPtr->node_queue_cond = 0;
raidPtr->node_queue = NULL;
raidPtr->dags_in_flight = 0;
diff --git a/sys/dev/raidframe/rf_general.h b/sys/dev/raidframe/rf_general.h
index 400036ed6d1..e92ed286ab8 100644
--- a/sys/dev/raidframe/rf_general.h
+++ b/sys/dev/raidframe/rf_general.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_general.h,v 1.11 2003/04/09 00:28:28 thorpej Exp $ */
+/* $NetBSD: rf_general.h,v 1.12 2004/01/01 19:27:36 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -52,7 +52,6 @@
void rf_print_panic_message(int, char *);
void rf_print_assert_panic_message(int, char *, char *);
void rf_print_unable_to_init_mutex(char *, int, int);
-void rf_print_unable_to_init_cond(char *, int, int);
void rf_print_unable_to_add_shutdown(char *, int, int);
diff --git a/sys/dev/raidframe/rf_raid.h b/sys/dev/raidframe/rf_raid.h
index 7a5062d03fe..3396e7431d2 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.22 2003/12/30 22:56:40 oster Exp $ */
+/* $NetBSD: rf_raid.h,v 1.23 2004/01/01 19:27:36 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -186,7 +186,6 @@ struct RF_Raid_s {
* Array-quiescence stuff
*/
RF_DECLARE_MUTEX(access_suspend_mutex)
- RF_DECLARE_COND(quiescent_cond)
RF_IoCount_t accesses_suspended;
RF_IoCount_t accs_in_flight;
int access_suspend_release;
@@ -213,7 +212,6 @@ struct RF_Raid_s {
* Engine thread control
*/
RF_DECLARE_MUTEX(node_queue_mutex)
- RF_DECLARE_COND(node_queue_cond)
RF_DagNode_t *node_queue;
RF_Thread_t parity_rewrite_thread;
RF_Thread_t copyback_thread;
diff --git a/sys/dev/raidframe/rf_reconstruct.h b/sys/dev/raidframe/rf_reconstruct.h
index 154cb0f7338..c37e0883425 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.11 2003/12/30 23:23:17 oster Exp $ */
+/* $NetBSD: rf_reconstruct.h,v 1.12 2004/01/01 19:27:36 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -132,8 +132,6 @@ struct RF_ReconCtrl_s {
* events */
RF_DECLARE_MUTEX(eq_mutex) /* mutex for locking event
* queue */
- RF_DECLARE_COND(eq_cond) /* condition variable for
- * signalling recon events */
int eq_count; /* debug only */
/* reconstruction buffer management */
diff --git a/sys/dev/raidframe/rf_reconutil.c b/sys/dev/raidframe/rf_reconutil.c
index 035008b9737..e6ed08ee001 100644
--- a/sys/dev/raidframe/rf_reconutil.c
+++ b/sys/dev/raidframe/rf_reconutil.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconutil.c,v 1.19 2003/12/30 21:59:03 oster Exp $ */
+/* $NetBSD: rf_reconutil.c,v 1.20 2004/01/01 19:27:36 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
********************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.19 2003/12/30 21:59:03 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.20 2004/01/01 19:27:36 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -125,7 +125,6 @@ rf_MakeReconControl(RF_RaidReconDesc_t *reconDesc,
/* initialize the event queue */
simple_lock_init(&reconCtrlPtr->eq_mutex);
- reconCtrlPtr->eq_cond = 0;
reconCtrlPtr->eventQueue = NULL;
reconCtrlPtr->eq_count = 0;