summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2003-12-29 05:48:13 +0000
committeroster <oster@NetBSD.org>2003-12-29 05:48:13 +0000
commitfc5966383f467034a3d13144f48186838ddda518 (patch)
treea0d19d31037cfa72b15b4cddb6fe285e6fc3888e /sys/dev/raidframe
parent2f4066f82e44bfab82413ef9fcf82692ad1a9b12 (diff)
_rf_create_managed_cond() is now left doing nothing. Convert callers.
Mash DO_RAID_COND in rf_driver.c out of existance. - Nuke (already #if 0'ed) _rf_create_managed_lkmgr_mutex() while we're busy here. simplify DO_INIT in rf_engine.c
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c12
-rw-r--r--sys/dev/raidframe/rf_driver.c19
-rw-r--r--sys/dev/raidframe/rf_engine.c17
-rw-r--r--sys/dev/raidframe/rf_paritylogging.c10
-rw-r--r--sys/dev/raidframe/rf_threadstuff.c45
-rw-r--r--sys/dev/raidframe/rf_threadstuff.h8
6 files changed, 19 insertions, 92 deletions
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index 9e529755793..de4b1e476b5 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.25 2003/12/29 05:22:16 oster Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.26 2003/12/29 05:48:13 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.25 2003/12/29 05:22:16 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.26 2003/12/29 05:48:13 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -191,8 +191,6 @@ rf_ConfigureDiskQueue(
RF_ShutdownList_t ** listp,
RF_AllocListElem_t * clList)
{
- int rc;
-
diskqueue->col = c;
diskqueue->qPtr = p;
diskqueue->qHdr = (p->Create) (sectPerDisk, clList, listp);
@@ -207,11 +205,7 @@ rf_ConfigureDiskQueue(
diskqueue->raidPtr = raidPtr;
diskqueue->rf_cinfo = &raidPtr->raid_cinfo[c];
rf_mutex_init(&diskqueue->mutex);
- rc = rf_create_managed_cond(listp, &diskqueue->cond);
- if (rc) {
- rf_print_unable_to_init_cond(__FILE__, __LINE__, rc);
- return (rc);
- }
+ diskqueue->cond = 0;
return (0);
}
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 001d227ff7e..ce24d4a68b0 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.75 2003/12/29 05:22:16 oster Exp $ */
+/* $NetBSD: rf_driver.c,v 1.76 2003/12/29 05:48:13 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.75 2003/12/29 05:22:16 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.76 2003/12/29 05:48:13 oster Exp $");
#include "opt_raid_diagnostic.h"
@@ -298,15 +298,6 @@ rf_Shutdown(raidPtr)
rf_mutex_init((_m_)); \
}
-#define DO_RAID_COND(_c_) { \
- rc = rf_create_managed_cond(&raidPtr->shutdownList, (_c_)); \
- if (rc) { \
- rf_print_unable_to_init_cond(__FILE__, __LINE__, rc); \
- DO_RAID_FAIL(); \
- return(rc); \
- } \
-}
-
int
rf_Configure(raidPtr, cfgPtr, ac)
RF_Raid_t *raidPtr;
@@ -377,15 +368,15 @@ rf_Configure(raidPtr, cfgPtr, ac)
DO_RAID_INIT_CONFIGURE(rf_ConfigureEngine);
DO_RAID_INIT_CONFIGURE(rf_ConfigureStripeLocks);
- DO_RAID_COND(&raidPtr->outstandingCond);
+ raidPtr->outstandingCond = 0;
raidPtr->nAccOutstanding = 0;
raidPtr->waitShutdown = 0;
DO_RAID_MUTEX(&raidPtr->access_suspend_mutex);
- DO_RAID_COND(&raidPtr->quiescent_cond);
+ raidPtr->quiescent_cond = 0;
- DO_RAID_COND(&raidPtr->waitForReconCond);
+ raidPtr->waitForReconCond = 0;
DO_RAID_MUTEX(&raidPtr->recon_done_proc_mutex);
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index c71430b1309..e30fd9d8fd4 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.26 2003/12/29 05:22:16 oster Exp $ */
+/* $NetBSD: rf_engine.c,v 1.27 2003/12/29 05:48:13 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.26 2003/12/29 05:22:16 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.27 2003/12/29 05:48:13 oster Exp $");
#include <sys/errno.h>
@@ -72,15 +72,6 @@ static void rf_ShutdownEngine(void *);
static void DAGExecutionThread(RF_ThreadArg_t arg);
static void rf_RaidIOThread(RF_ThreadArg_t arg);
-#define DO_INIT(_l_,_r_) { \
- int _rc; \
- rf_mutex_init(&(_r_)->node_queue_mutex); \
- _rc = rf_create_managed_cond(_l_,&(_r_)->node_queue_cond); \
- if (_rc) { \
- return(_rc); \
- } \
-}
-
/* synchronization primitives for this file. DO_WAIT should be enclosed in a while loop. */
#define DO_LOCK(_r_) \
@@ -139,8 +130,8 @@ rf_ConfigureEngine(
{
int rc;
- DO_INIT(listp, raidPtr);
-
+ 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_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index 81d5e992262..57a0d6630a6 100644
--- a/sys/dev/raidframe/rf_paritylogging.c
+++ b/sys/dev/raidframe/rf_paritylogging.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogging.c,v 1.20 2003/12/29 05:36:19 oster Exp $ */
+/* $NetBSD: rf_paritylogging.c,v 1.21 2003/12/29 05:48:13 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.20 2003/12/29 05:36:19 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.21 2003/12/29 05:48:13 oster Exp $");
#include "rf_archs.h"
@@ -424,11 +424,7 @@ rf_ConfigureParityLogging(
}
/* initialize parityLogDiskQueue */
rf_mutex_init(&raidPtr->parityLogDiskQueue.mutex);
- rc = rf_create_managed_cond(listp, &raidPtr->parityLogDiskQueue.cond);
- if (rc) {
- rf_print_unable_to_init_cond(__FILE__, __LINE__, rc);
- return (rc);
- }
+ raidPtr->parityLogDiskQueue.cond = 0;
raidPtr->parityLogDiskQueue.flushQueue = NULL;
raidPtr->parityLogDiskQueue.reintQueue = NULL;
raidPtr->parityLogDiskQueue.bufHead = NULL;
diff --git a/sys/dev/raidframe/rf_threadstuff.c b/sys/dev/raidframe/rf_threadstuff.c
index 1d2348bfdde..55f52b27371 100644
--- a/sys/dev/raidframe/rf_threadstuff.c
+++ b/sys/dev/raidframe/rf_threadstuff.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.c,v 1.17 2003/12/29 05:36:19 oster Exp $ */
+/* $NetBSD: rf_threadstuff.c,v 1.18 2003/12/29 05:48:13 oster Exp $ */
/*
* rf_threadstuff.c
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_threadstuff.c,v 1.17 2003/12/29 05:36:19 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_threadstuff.c,v 1.18 2003/12/29 05:48:13 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -42,42 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: rf_threadstuff.c,v 1.17 2003/12/29 05:36:19 oster Ex
* Shared stuff
*/
-#if 0
-int
-_rf_create_managed_lkmgr_mutex(listp, m, file, line)
- RF_ShutdownList_t **listp;
-RF_DECLARE_LKMGR_MUTEX(*m)
- char *file;
- int line;
-{
- int rc, rc1;
-
- rc = rf_lkmgr_mutex_init(m);
- if (rc)
- return (rc);
- rc = _rf_ShutdownCreate(listp, mutex_destroyer, (void *) m, file, line);
- if (rc) {
- RF_ERRORMSG1("RAIDFRAME: Error %d adding shutdown entry\n", rc);
- rc1 = rf_lkmgr_mutex_destroy(m);
- if (rc1) {
- RF_ERRORMSG1("RAIDFRAME: Error %d destroying mutex\n", rc1);
- }
- }
- return (rc);
-}
-#endif
-int
-_rf_create_managed_cond(listp, c, file, line)
- RF_ShutdownList_t **listp;
-RF_DECLARE_COND(*c)
- char *file;
- int line;
-{
-
- c = 0;
- return (0);
-}
-
int
_rf_init_managed_threadgroup(listp, g, file, line)
RF_ShutdownList_t **listp;
@@ -85,12 +49,9 @@ _rf_init_managed_threadgroup(listp, g, file, line)
char *file;
int line;
{
- int rc;
rf_mutex_init(&g->mutex);
- rc = _rf_create_managed_cond(listp, &g->cond, file, line);
- if (rc)
- return (rc);
+ g->cond = 0;
g->created = g->running = g->shutdown = 0;
return (0);
}
diff --git a/sys/dev/raidframe/rf_threadstuff.h b/sys/dev/raidframe/rf_threadstuff.h
index b4cb2ad4bb9..d9a944dac8c 100644
--- a/sys/dev/raidframe/rf_threadstuff.h
+++ b/sys/dev/raidframe/rf_threadstuff.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_threadstuff.h,v 1.17 2003/12/29 05:36:19 oster Exp $ */
+/* $NetBSD: rf_threadstuff.h,v 1.18 2003/12/29 05:48:13 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -51,7 +51,6 @@
#include <dev/raidframe/raidframevar.h>
-#define rf_create_managed_cond(a,b) _rf_create_managed_cond(a,b,__FILE__,__LINE__)
#define rf_init_managed_threadgroup(a,b) _rf_init_managed_threadgroup(a,b,__FILE__,__LINE__)
#define rf_init_threadgroup(a) _rf_init_threadgroup(a,__FILE__,__LINE__)
#define rf_destroy_threadgroup(a) _rf_destroy_threadgroup(a,__FILE__,__LINE__)
@@ -188,9 +187,4 @@ int
_rf_create_managed_lkmgr_mutex(RF_ShutdownList_t **, struct lock *,
char *, int);
-
-int
-_rf_create_managed_cond(RF_ShutdownList_t ** listp, int *,
- char *file, int line);
-
#endif /* !_RF__RF_THREADSTUFF_H_ */