Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Since rf_mutex_destroy() is effectively a NOP now, nuke it.

Browse Source
This commit is contained in:
oster 2003-12-29 05:01:14 +00:00
parent b2b6428115
commit 9a5cad32eb
8 changed files with 15 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/raidframe/rf_acctrace.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_acctrace.c,v 1.11 2003/12/29 04:56:26 oster Exp $ */
/* $NetBSD: rf_acctrace.c,v 1.12 2003/12/29 05:01:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -34,7 +34,7 @@
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.11 2003/12/29 04:56:26 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.12 2003/12/29 05:01:14 oster Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@ -66,7 +66,6 @@ static void rf_ShutdownAccessTrace(ignored)
accessTraceBufCount = 0;
RF_Free(access_tracebuf, rf_accessTraceBufSize * sizeof(RF_AccTraceEntry_t));
}
rf_mutex_destroy(&rf_tracing_mutex);
}
int
@ -87,7 +86,6 @@ rf_ConfigureAccessTrace(listp)
rf_print_unable_to_add_shutdown(__FILE__, __LINE__, rc);
if (rf_accessTraceBufSize) {
RF_Free(access_tracebuf, rf_accessTraceBufSize * sizeof(RF_AccTraceEntry_t));
rf_mutex_destroy(&rf_tracing_mutex);
}
}
return (rc);

18
sys/dev/raidframe/rf_paritylogging.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_paritylogging.c,v 1.17 2003/12/29 03:33:48 oster Exp $ */
/* $NetBSD: rf_paritylogging.c,v 1.18 2003/12/29 05:01:14 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.17 2003/12/29 03:33:48 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.18 2003/12/29 05:01:14 oster Exp $");
#include "rf_archs.h"
@ -313,7 +313,6 @@ rf_ConfigureParityLogging(
rc = rf_cond_init(&raidPtr->regionBufferPool.cond);
if (rc) {
rf_print_unable_to_init_cond(__FILE__, __LINE__, rc);
rf_mutex_destroy(&raidPtr->regionBufferPool.mutex);
return (ENOMEM);
}
raidPtr->regionBufferPool.bufferSize = raidPtr->regionLogCapacity *
@ -335,7 +334,6 @@ rf_ConfigureParityLogging(
raidPtr->regionBufferPool.totalBuffers * sizeof(caddr_t),
(caddr_t *));
if (raidPtr->regionBufferPool.buffers == NULL) {
rf_mutex_destroy(&raidPtr->regionBufferPool.mutex);
rf_cond_destroy(&raidPtr->regionBufferPool.cond);
return (ENOMEM);
}
@ -347,7 +345,6 @@ rf_ConfigureParityLogging(
raidPtr->regionBufferPool.bufferSize * sizeof(char),
(caddr_t));
if (raidPtr->regionBufferPool.buffers[i] == NULL) {
rf_mutex_destroy(&raidPtr->regionBufferPool.mutex);
rf_cond_destroy(&raidPtr->regionBufferPool.cond);
for (j = 0; j < i; j++) {
RF_Free(raidPtr->regionBufferPool.buffers[i],
@ -381,7 +378,6 @@ rf_ConfigureParityLogging(
rc = rf_cond_init(&raidPtr->parityBufferPool.cond);
if (rc) {
rf_print_unable_to_init_cond(__FILE__, __LINE__, rc);
rf_mutex_destroy(&raidPtr->parityBufferPool.mutex);
return (ENOMEM);
}
raidPtr->parityBufferPool.bufferSize = parityBufferCapacity *
@ -404,7 +400,6 @@ rf_ConfigureParityLogging(
raidPtr->parityBufferPool.totalBuffers * sizeof(caddr_t),
(caddr_t *));
if (raidPtr->parityBufferPool.buffers == NULL) {
rf_mutex_destroy(&raidPtr->parityBufferPool.mutex);
rf_cond_destroy(&raidPtr->parityBufferPool.cond);
return (ENOMEM);
}
@ -416,7 +411,6 @@ rf_ConfigureParityLogging(
raidPtr->parityBufferPool.bufferSize * sizeof(char),
(caddr_t));
if (raidPtr->parityBufferPool.buffers == NULL) {
rf_mutex_destroy(&raidPtr->parityBufferPool.mutex);
rf_cond_destroy(&raidPtr->parityBufferPool.cond);
for (j = 0; j < i; j++) {
RF_Free(raidPtr->parityBufferPool.buffers[i],
@ -487,7 +481,6 @@ rf_ConfigureParityLogging(
rc = rf_mutex_init(&raidPtr->regionInfo[i].reintMutex);
if (rc) {
rf_print_unable_to_init_mutex(__FILE__, __LINE__, rc);
rf_mutex_destroy(&raidPtr->regionInfo[i].mutex);
for (j = 0; j < i; j++)
FreeRegionInfo(raidPtr, j);
RF_Free(raidPtr->regionInfo,
@ -531,8 +524,6 @@ rf_ConfigureParityLogging(
sizeof(RF_DiskMap_t)),
(RF_DiskMap_t *));
if (raidPtr->regionInfo[i].diskMap == NULL) {
rf_mutex_destroy(&raidPtr->regionInfo[i].mutex);
rf_mutex_destroy(&raidPtr->regionInfo[i].reintMutex);
for (j = 0; j < i; j++)
FreeRegionInfo(raidPtr, j);
RF_Free(raidPtr->regionInfo,
@ -609,8 +600,6 @@ FreeRegionInfo(
RF_ASSERT(raidPtr->regionInfo[regionID].diskCount == 0);
}
RF_UNLOCK_MUTEX(raidPtr->regionInfo[regionID].mutex);
rf_mutex_destroy(&raidPtr->regionInfo[regionID].mutex);
rf_mutex_destroy(&raidPtr->regionInfo[regionID].reintMutex);
}
@ -631,7 +620,6 @@ FreeParityLogQueue(
RF_Free(l2, sizeof(RF_ParityLog_t));
}
RF_UNLOCK_MUTEX(queue->mutex);
rf_mutex_destroy(&queue->mutex);
}
@ -649,7 +637,6 @@ FreeRegionBufferQueue(RF_RegionBufferQueue_t * queue)
RF_Free(queue->buffers[i], queue->bufferSize);
RF_Free(queue->buffers, queue->totalBuffers * sizeof(caddr_t));
RF_UNLOCK_MUTEX(queue->mutex);
rf_mutex_destroy(&queue->mutex);
}
static void
@ -737,7 +724,6 @@ rf_ShutdownParityLoggingDiskQueue(RF_ThreadArg_t arg)
}
while (raidPtr->parityLogDiskQueue.freeCommonList) {
c = raidPtr->parityLogDiskQueue.freeCommonList;
rf_mutex_destroy(&c->mutex);
raidPtr->parityLogDiskQueue.freeCommonList =
raidPtr->parityLogDiskQueue.freeCommonList->next;
RF_Free(c, sizeof(RF_CommonLogData_t));

5
sys/dev/raidframe/rf_psstatus.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_psstatus.c,v 1.17 2003/12/29 04:56:26 oster Exp $ */
/* $NetBSD: rf_psstatus.c,v 1.18 2003/12/29 05:01:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -37,7 +37,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.17 2003/12/29 04:56:26 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.18 2003/12/29 05:01:14 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@ -139,7 +139,6 @@ rf_FreeParityStripeStatusTable(raidPtr, pssTable)
if (pssTable[i].chain) {
printf("ERROR: pss hash chain not null at recon shutdown\n");
}
rf_mutex_destroy(&pssTable[i].mutex);
}
RF_Free(pssTable, raidPtr->pssTableSize * sizeof(RF_PSStatusHeader_t));
}

5
sys/dev/raidframe/rf_reconmap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_reconmap.c,v 1.20 2003/12/29 04:56:26 oster Exp $ */
/* $NetBSD: rf_reconmap.c,v 1.21 2003/12/29 05:01:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -34,7 +34,7 @@
*************************************************************************/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.20 2003/12/29 04:56:26 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.21 2003/12/29 05:01:14 oster Exp $");
#include "rf_raid.h"
#include <sys/time.h>
@ -303,7 +303,6 @@ rf_FreeReconMap(mapPtr)
}
}
pool_destroy(&mapPtr->elem_pool);
rf_mutex_destroy(&mapPtr->mutex);
RF_Free(mapPtr->status, mapPtr->totalRUs *
sizeof(RF_ReconMapListElem_t *));
RF_Free(mapPtr, sizeof(RF_ReconMap_t));

6
sys/dev/raidframe/rf_reconutil.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_reconutil.c,v 1.17 2003/12/29 04:39:29 oster Exp $ */
/* $NetBSD: rf_reconutil.c,v 1.18 2003/12/29 05:01:14 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.17 2003/12/29 04:39:29 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_reconutil.c,v 1.18 2003/12/29 05:01:14 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@ -166,8 +166,6 @@ rf_FreeReconControl(raidPtr)
reconCtrlPtr->floatingRbufs = t->next;
rf_FreeReconBuffer(t);
}
rf_mutex_destroy(&reconCtrlPtr->rb_mutex);
rf_mutex_destroy(&reconCtrlPtr->eq_mutex);
rf_FreeReconMap(reconCtrlPtr->reconMap);
rf_FreeParityStripeStatusTable(raidPtr, reconCtrlPtr->pssTable);
RF_Free(reconCtrlPtr->perDiskInfo,

8
sys/dev/raidframe/rf_stripelocks.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_stripelocks.c,v 1.18 2003/12/29 04:56:26 oster Exp $ */
/* $NetBSD: rf_stripelocks.c,v 1.19 2003/12/29 05:01:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -57,7 +57,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.18 2003/12/29 04:56:26 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.19 2003/12/29 05:01:14 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@ -196,16 +196,12 @@ rf_MakeLockTable()
static void
rf_ShutdownStripeLocks(RF_LockTableEntry_t * lockTable)
{
int i;
#if RF_DEBUG_STRIPELOCK
if (rf_stripeLockDebug) {
PrintLockedStripes(lockTable);
}
#endif
for (i = 0; i < rf_lockTableSize; i++) {
rf_mutex_destroy(&lockTable[i].mutex);
}
RF_Free(lockTable, rf_lockTableSize * sizeof(RF_LockTableEntry_t));
}

8
sys/dev/raidframe/rf_threadstuff.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_threadstuff.c,v 1.13 2003/12/29 04:56:26 oster Exp $ */
/* $NetBSD: rf_threadstuff.c,v 1.14 2003/12/29 05:01:14 oster Exp $ */
/*
* rf_threadstuff.c
*/
@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rf_threadstuff.c,v 1.13 2003/12/29 04:56:26 oster Exp $");
__KERNEL_RCSID(0, "$NetBSD: rf_threadstuff.c,v 1.14 2003/12/29 05:01:14 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@ -50,7 +50,6 @@ mutex_destroyer(arg)
void *arg;
{
rf_mutex_destroy(arg);
}
static void
@ -79,7 +78,6 @@ RF_DECLARE_MUTEX(*m)
rc = _rf_ShutdownCreate(listp, mutex_destroyer, (void *) m, file, line);
if (rc) {
RF_ERRORMSG1("RAIDFRAME: Error %d adding shutdown entry\n", rc);
rf_mutex_destroy(m);
}
return (rc);
}
@ -158,7 +156,6 @@ _rf_destroy_threadgroup(g, file, line)
{
int rc1, rc2;
rc1 = rf_mutex_destroy(&g->mutex);
rc2 = rf_cond_destroy(&g->cond);
if (rc1)
return (rc1);
@ -178,7 +175,6 @@ _rf_init_threadgroup(g, file, line)
return (rc);
rc = rf_cond_init(&g->cond);
if (rc) {
rf_mutex_destroy(&g->mutex);
return (rc);
}
g->created = g->running = g->shutdown = 0;

3
sys/dev/raidframe/rf_threadstuff.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: rf_threadstuff.h,v 1.14 2003/12/29 04:56:26 oster Exp $ */
/* $NetBSD: rf_threadstuff.h,v 1.15 2003/12/29 05:01:14 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@ -182,7 +182,6 @@ struct RF_ThreadGroup_s {
#endif
#define rf_mutex_init(m) simple_lock_init(m)
#define rf_mutex_destroy(m)
int
_rf_create_managed_mutex(RF_ShutdownList_t **, struct simplelock *,