summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2006-11-16 01:32:37 +0000
committerchristos <christos@NetBSD.org>2006-11-16 01:32:37 +0000
commit168cd830d22e1f4a4c2bde1105f9f94d40fb870d (patch)
treef82ce44db748b3513a12da35feca2a8d352de90f /sys/dev/raidframe
parentc72ed40f2540010a7b00337d0da9266cc2092eb6 (diff)
__unused removal on arguments; approved by core.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_acctrace.c6
-rw-r--r--sys/dev/raidframe/rf_alloclist.c6
-rw-r--r--sys/dev/raidframe/rf_callback.c6
-rw-r--r--sys/dev/raidframe/rf_chaindecluster.c10
-rw-r--r--sys/dev/raidframe/rf_copyback.c6
-rw-r--r--sys/dev/raidframe/rf_cvscan.c8
-rw-r--r--sys/dev/raidframe/rf_dagdegrd.c20
-rw-r--r--sys/dev/raidframe/rf_dagdegwr.c14
-rw-r--r--sys/dev/raidframe/rf_dagffrd.c16
-rw-r--r--sys/dev/raidframe/rf_dagffwr.c20
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.c14
-rw-r--r--sys/dev/raidframe/rf_dagutils.c14
-rw-r--r--sys/dev/raidframe/rf_debugMem.c6
-rw-r--r--sys/dev/raidframe/rf_decluster.c10
-rw-r--r--sys/dev/raidframe/rf_declusterPQ.c6
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c6
-rw-r--r--sys/dev/raidframe/rf_disks.c14
-rw-r--r--sys/dev/raidframe/rf_driver.c6
-rw-r--r--sys/dev/raidframe/rf_engine.c6
-rw-r--r--sys/dev/raidframe/rf_evenodd.c16
-rw-r--r--sys/dev/raidframe/rf_fifo.c8
-rw-r--r--sys/dev/raidframe/rf_interdecluster.c14
-rw-r--r--sys/dev/raidframe/rf_map.c6
-rw-r--r--sys/dev/raidframe/rf_mcpair.c6
-rw-r--r--sys/dev/raidframe/rf_netbsdkintf.c34
-rw-r--r--sys/dev/raidframe/rf_nwayxor.c6
-rw-r--r--sys/dev/raidframe/rf_paritylogDiskMgr.c6
-rw-r--r--sys/dev/raidframe/rf_paritylogging.c18
-rw-r--r--sys/dev/raidframe/rf_parityloggingdags.c22
-rw-r--r--sys/dev/raidframe/rf_parityscan.c8
-rw-r--r--sys/dev/raidframe/rf_psstatus.c12
-rw-r--r--sys/dev/raidframe/rf_raid0.c28
-rw-r--r--sys/dev/raidframe/rf_raid1.c14
-rw-r--r--sys/dev/raidframe/rf_raid4.c20
-rw-r--r--sys/dev/raidframe/rf_raid5.c18
-rw-r--r--sys/dev/raidframe/rf_raid5_rotatedspare.c10
-rw-r--r--sys/dev/raidframe/rf_reconmap.c6
-rw-r--r--sys/dev/raidframe/rf_reconstruct.c20
-rw-r--r--sys/dev/raidframe/rf_revent.c6
-rw-r--r--sys/dev/raidframe/rf_sstf.c16
-rw-r--r--sys/dev/raidframe/rf_stripelocks.c8
-rw-r--r--sys/dev/raidframe/rf_utils.c8
42 files changed, 252 insertions, 252 deletions
diff --git a/sys/dev/raidframe/rf_acctrace.c b/sys/dev/raidframe/rf_acctrace.c
index b66e2a02bac..c3eb173bcce 100644
--- a/sys/dev/raidframe/rf_acctrace.c
+++ b/sys/dev/raidframe/rf_acctrace.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_acctrace.c,v 1.22 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_acctrace.c,v 1.23 2006/11/16 01:33:23 christos 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.22 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_acctrace.c,v 1.23 2006/11/16 01:33:23 christos Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -55,7 +55,7 @@ static long numTracesSoFar;
RF_DECLARE_MUTEX(rf_tracing_mutex)
int
-rf_ConfigureAccessTrace(RF_ShutdownList_t **listp __unused)
+rf_ConfigureAccessTrace(RF_ShutdownList_t **listp)
{
numTracesSoFar = 0;
rf_mutex_init(&rf_tracing_mutex);
diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c
index 54bb45652f2..842517e16d6 100644
--- a/sys/dev/raidframe/rf_alloclist.c
+++ b/sys/dev/raidframe/rf_alloclist.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_alloclist.c,v 1.24 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_alloclist.c,v 1.25 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -37,7 +37,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.24 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.25 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -57,7 +57,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.24 2006/10/12 01:31:50 christos E
static void rf_ShutdownAllocList(void *);
-static void rf_ShutdownAllocList(void *ignored __unused)
+static void rf_ShutdownAllocList(void *ignored)
{
pool_destroy(&rf_pools.alloclist);
}
diff --git a/sys/dev/raidframe/rf_callback.c b/sys/dev/raidframe/rf_callback.c
index a14f537333e..f020922c11b 100644
--- a/sys/dev/raidframe/rf_callback.c
+++ b/sys/dev/raidframe/rf_callback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_callback.c,v 1.19 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_callback.c,v 1.20 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.19 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.20 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include <sys/pool.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.19 2006/10/12 01:31:50 christos Ex
static void rf_ShutdownCallback(void *);
static void
-rf_ShutdownCallback(void *ignored __unused)
+rf_ShutdownCallback(void *ignored)
{
pool_destroy(&rf_pools.callback);
}
diff --git a/sys/dev/raidframe/rf_chaindecluster.c b/sys/dev/raidframe/rf_chaindecluster.c
index 8aeb47a8921..3ec472e597c 100644
--- a/sys/dev/raidframe/rf_chaindecluster.c
+++ b/sys/dev/raidframe/rf_chaindecluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_chaindecluster.c,v 1.14 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_chaindecluster.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.14 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_chaindecluster.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -61,8 +61,8 @@ typedef struct RF_ChaindeclusterConfigInfo_s {
} RF_ChaindeclusterConfigInfo_t;
int
-rf_ConfigureChainDecluster(RF_ShutdownList_t **listp __unused,
- RF_Raid_t *raidPtr, RF_Config_t *cfgPtr __unused)
+rf_ConfigureChainDecluster(RF_ShutdownList_t **listp,
+ RF_Raid_t *raidPtr, RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_StripeCount_t num_used_stripeUnitsPerDisk;
@@ -218,7 +218,7 @@ rf_IdentifyStripeChainDecluster(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
}
void
-rf_MapSIDToPSIDChainDecluster(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDChainDecluster(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID,
RF_ReconUnitNum_t *which_ru)
diff --git a/sys/dev/raidframe/rf_copyback.c b/sys/dev/raidframe/rf_copyback.c
index c5e99367ed9..f4059d2a4e6 100644
--- a/sys/dev/raidframe/rf_copyback.c
+++ b/sys/dev/raidframe/rf_copyback.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_copyback.c,v 1.36 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_copyback.c,v 1.37 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -38,7 +38,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.36 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_copyback.c,v 1.37 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -69,7 +69,7 @@ static void rf_CopybackOne(RF_CopybackDesc_t * desc, int typ,
static void rf_CopybackComplete(RF_CopybackDesc_t * desc, int status);
int
-rf_ConfigureCopyback(RF_ShutdownList_t **listp __unused)
+rf_ConfigureCopyback(RF_ShutdownList_t **listp)
{
rf_copyback_in_progress = 0;
return (0);
diff --git a/sys/dev/raidframe/rf_cvscan.c b/sys/dev/raidframe/rf_cvscan.c
index adac9122f24..6b7128239f9 100644
--- a/sys/dev/raidframe/rf_cvscan.c
+++ b/sys/dev/raidframe/rf_cvscan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_cvscan.c,v 1.14 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_cvscan.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.14 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_cvscan.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include "rf_alloclist.h"
@@ -205,7 +205,7 @@ RealEnqueue(RF_CvscanHeader_t *hdr, RF_DiskQueueData_t *req)
void
-rf_CvscanEnqueue(void *q_in, RF_DiskQueueData_t * elem, int priority __unused)
+rf_CvscanEnqueue(void *q_in, RF_DiskQueueData_t * elem, int priority)
{
RF_CvscanHeader_t *hdr = (RF_CvscanHeader_t *) q_in;
RealEnqueue(hdr, elem /* req */ );
@@ -322,7 +322,7 @@ rf_CvscanPeek(void *q_in)
void *
rf_CvscanCreate(RF_SectorCount_t sectPerDisk,
RF_AllocListElem_t *clList,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_CvscanHeader_t *hdr;
long range = 2; /* Currently no mechanism to change these */
diff --git a/sys/dev/raidframe/rf_dagdegrd.c b/sys/dev/raidframe/rf_dagdegrd.c
index f8779c3144b..75f27bcec40 100644
--- a/sys/dev/raidframe/rf_dagdegrd.c
+++ b/sys/dev/raidframe/rf_dagdegrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegrd.c,v 1.26 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.26 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegrd.c,v 1.27 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -114,8 +114,8 @@ void
rf_CreateRaidOneDegradedReadDAG(RF_Raid_t *raidPtr,
RF_AccessStripeMap_t *asmap,
RF_DagHeader_t *dag_h,
- void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList)
{
RF_DagNode_t *rdNode, *blockNode, *commitNode, *termNode;
@@ -260,8 +260,8 @@ rf_CreateRaidOneDegradedReadDAG(RF_Raid_t *raidPtr,
void
rf_CreateDegradedReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const RF_RedFuncs_t *recFunc)
{
@@ -575,8 +575,8 @@ rf_CreateDegradedReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CreateRaidCDegradedReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList)
{
RF_DagNode_t *nodes, *rdNode, *blockNode, *commitNode, *termNode;
@@ -1031,8 +1031,8 @@ rf_InitNode(node, rf_wait, RF_FALSE, rf_DiskReadFunc, rf_DiskReadUndoFunc, rf_Ge
void
rf_DoubleDegRead(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const char *redundantReadNodeName,
const char *recoveryNodeName,
diff --git a/sys/dev/raidframe/rf_dagdegwr.c b/sys/dev/raidframe/rf_dagdegwr.c
index eb10ab1cec6..78bdc58aa7f 100644
--- a/sys/dev/raidframe/rf_dagdegwr.c
+++ b/sys/dev/raidframe/rf_dagdegwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagdegwr.c,v 1.29 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.29 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagdegwr.c,v 1.30 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -154,8 +154,8 @@ rf_CreateDegradedWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CommonCreateSimpleDegradedWriteDAG(RF_Raid_t *raidPtr,
RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
int nfaults,
int (*redFunc) (RF_DagNode_t *),
@@ -711,11 +711,11 @@ rf_WriteGenerateFailedAccessASMs(
void
rf_DoubleDegSmallWrite(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const char *redundantReadNodeName,
- const char *redundantWriteNodeName __unused,
+ const char *redundantWriteNodeName,
const char *recoveryNodeName,
int (*recovFunc) (RF_DagNode_t *))
{
diff --git a/sys/dev/raidframe/rf_dagffrd.c b/sys/dev/raidframe/rf_dagffrd.c
index 70062391f21..b96c5e4c0cb 100644
--- a/sys/dev/raidframe/rf_dagffrd.c
+++ b/sys/dev/raidframe/rf_dagffrd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffrd.c,v 1.17 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagffrd.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.17 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffrd.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -124,9 +124,9 @@ rf_CreateFaultFreeReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
*****************************************************************************/
void
-rf_CreateNonredundantDAG(RF_Raid_t *raidPtr __unused,
- RF_AccessStripeMap_t *asmap, RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused, RF_AllocListElem_t *allocList,
+rf_CreateNonredundantDAG(RF_Raid_t *raidPtr,
+ RF_AccessStripeMap_t *asmap, RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags, RF_AllocListElem_t *allocList,
RF_IoType_t type)
{
RF_DagNode_t *diskNodes, *blockNode, *commitNode, *termNode;
@@ -317,9 +317,9 @@ rf_CreateNonredundantDAG(RF_Raid_t *raidPtr __unused,
*****************************************************************************/
static void
-CreateMirrorReadDAG(RF_Raid_t *raidPtr __unused, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused, RF_AllocListElem_t *allocList,
+CreateMirrorReadDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags, RF_AllocListElem_t *allocList,
int (*readfunc) (RF_DagNode_t * node))
{
RF_DagNode_t *readNodes, *blockNode, *commitNode, *termNode;
diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c
index 240eef7cf29..05087a2378e 100644
--- a/sys/dev/raidframe/rf_dagffwr.c
+++ b/sys/dev/raidframe/rf_dagffwr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagffwr.c,v 1.32 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagffwr.c,v 1.33 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.32 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.33 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -81,7 +81,7 @@ rf_CreateNonRedundantWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
RF_DagHeader_t *dag_h, void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
- RF_IoType_t type __unused)
+ RF_IoType_t type)
{
rf_CreateNonredundantDAG(raidPtr, asmap, dag_h, bp, flags, allocList,
RF_IO_TYPE_WRITE);
@@ -92,7 +92,7 @@ rf_CreateRAID0WriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
RF_DagHeader_t *dag_h, void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
- RF_IoType_t type __unused)
+ RF_IoType_t type)
{
rf_CreateNonredundantDAG(raidPtr, asmap, dag_h, bp, flags, allocList,
RF_IO_TYPE_WRITE);
@@ -160,8 +160,8 @@ rf_CreateLargeWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CommonCreateLargeWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
int nfaults, int (*redFunc) (RF_DagNode_t *),
int allowBufferRecycle)
@@ -518,8 +518,8 @@ rf_CommonCreateLargeWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList,
const RF_RedFuncs_t *pfuncs,
const RF_RedFuncs_t *qfuncs)
@@ -1191,8 +1191,8 @@ rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
void
rf_CreateRaidOneWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
- RF_DagHeader_t *dag_h, void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ RF_DagHeader_t *dag_h, void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t *allocList)
{
RF_DagNode_t *unblockNode, *termNode, *commitNode;
diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c
index 197fb255541..932de74fc24 100644
--- a/sys/dev/raidframe/rf_dagfuncs.c
+++ b/sys/dev/raidframe/rf_dagfuncs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagfuncs.c,v 1.27 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagfuncs.c,v 1.28 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.27 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.28 2006/11/16 01:33:23 christos Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -83,7 +83,7 @@ int (*rf_RecoveryXorUndoFunc) (RF_DagNode_t *);
* main (only) configuration routine for this module
****************************************************************************/
int
-rf_ConfigureDAGFuncs(RF_ShutdownList_t **listp __unused)
+rf_ConfigureDAGFuncs(RF_ShutdownList_t **listp)
{
RF_ASSERT(((sizeof(long) == 8) && RF_LONGSHIFT == 3) ||
((sizeof(long) == 4) && RF_LONGSHIFT == 2));
@@ -111,7 +111,7 @@ rf_TerminateFunc(RF_DagNode_t *node)
}
int
-rf_TerminateUndoFunc(RF_DagNode_t *node __unused)
+rf_TerminateUndoFunc(RF_DagNode_t *node)
{
return (0);
}
@@ -153,7 +153,7 @@ rf_DiskReadMirrorPartitionFunc(RF_DagNode_t *node)
#endif
int
-rf_DiskReadMirrorUndoFunc(RF_DagNode_t *node __unused)
+rf_DiskReadMirrorUndoFunc(RF_DagNode_t *node)
{
return (0);
}
@@ -234,13 +234,13 @@ rf_ParityLogOverwriteFunc(RF_DagNode_t *node)
}
int
-rf_ParityLogUpdateUndoFunc(RF_DagNode_t *node __unused)
+rf_ParityLogUpdateUndoFunc(RF_DagNode_t *node)
{
return (0);
}
int
-rf_ParityLogOverwriteUndoFunc(RF_DagNode_t *node __unused)
+rf_ParityLogOverwriteUndoFunc(RF_DagNode_t *node)
{
return (0);
}
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index b73202aa6ae..dfc3ca27567 100644
--- a/sys/dev/raidframe/rf_dagutils.c
+++ b/sys/dev/raidframe/rf_dagutils.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagutils.c,v 1.49 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_dagutils.c,v 1.50 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.49 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.50 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -225,7 +225,7 @@ rf_FreeDAG(RF_DagHeader_t *dag_h)
static void rf_ShutdownDAGs(void *);
static void
-rf_ShutdownDAGs(void *ignored __unused)
+rf_ShutdownDAGs(void *ignored)
{
pool_destroy(&rf_pools.dagh);
pool_destroy(&rf_pools.dagnode);
@@ -347,7 +347,7 @@ rf_FreeFuncList(RF_FuncList_t *funcList)
void *
rf_AllocStripeBuffer(RF_Raid_t *raidPtr, RF_DagHeader_t *dag_h,
- int size __unused)
+ int size)
{
RF_VoidPointerListElem_t *vple;
void *p;
@@ -426,7 +426,7 @@ rf_AllocBuffer(RF_Raid_t *raidPtr, RF_DagHeader_t *dag_h, int size)
}
void *
-rf_AllocIOBuffer(RF_Raid_t *raidPtr, int size __unused)
+rf_AllocIOBuffer(RF_Raid_t *raidPtr, int size)
{
RF_VoidPointerListElem_t *vple;
void *p;
@@ -993,7 +993,7 @@ rf_MapUnaccessedPortionOfStripe(RF_Raid_t *raidPtr,
RF_AccessStripeMapHeader_t **new_asm_h,
int *nRodNodes,
char **sosBuffer, char **eosBuffer,
- RF_AllocListElem_t *allocList __unused)
+ RF_AllocListElem_t *allocList)
{
RF_RaidAddr_t sosRaidAddress, eosRaidAddress;
RF_SectorNum_t sosNumSector, eosNumSector;
@@ -1086,7 +1086,7 @@ rf_GenerateFailedAccessASMs(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
RF_AccessStripeMapHeader_t **new_asm_h,
int *nXorBufs, char **rpBufPtr,
char *overlappingPDAs,
- RF_AllocListElem_t *allocList __unused)
+ RF_AllocListElem_t *allocList)
{
RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
diff --git a/sys/dev/raidframe/rf_debugMem.c b/sys/dev/raidframe/rf_debugMem.c
index f9884fa5e76..33e289145b3 100644
--- a/sys/dev/raidframe/rf_debugMem.c
+++ b/sys/dev/raidframe/rf_debugMem.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_debugMem.c,v 1.17 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_debugMem.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.17 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_debugMem.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -115,7 +115,7 @@ rf_print_unfreed()
#endif /* RF_DEBUG_MEM */
int
-rf_ConfigureDebugMem(RF_ShutdownList_t **listp __unused)
+rf_ConfigureDebugMem(RF_ShutdownList_t **listp)
{
#if RF_DEBUG_MEM
int i, rc;
diff --git a/sys/dev/raidframe/rf_decluster.c b/sys/dev/raidframe/rf_decluster.c
index f157423cc67..4117736b8b8 100644
--- a/sys/dev/raidframe/rf_decluster.c
+++ b/sys/dev/raidframe/rf_decluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_decluster.c,v 1.20 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_decluster.c,v 1.21 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
*--------------------------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.20 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.21 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -68,7 +68,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_decluster.c,v 1.20 2006/10/12 01:31:50 christos E
/* configuration code */
int
-rf_ConfigureDeclustered(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureDeclustered(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
@@ -493,7 +493,7 @@ rf_GetDefaultHeadSepLimitDeclustered(RF_Raid_t *raidPtr)
* don't use up all your system memory with buffers.
*/
int
-rf_GetDefaultNumFloatingReconBuffersDeclustered(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersDeclustered(RF_Raid_t * raidPtr)
{
return (100 * rf_numBufsToAccumulate);
}
@@ -612,7 +612,7 @@ rf_remap_to_spare_space(RF_RaidLayout_t *layoutPtr,
#if (RF_INCLUDE_PARITY_DECLUSTERING_DS > 0)
int
-rf_InstallSpareTable(RF_Raid_t *raidPtr, RF_RowCol_t frow __unused,
+rf_InstallSpareTable(RF_Raid_t *raidPtr, RF_RowCol_t frow,
RF_RowCol_t fcol)
{
RF_DeclusteredConfigInfo_t *info = (RF_DeclusteredConfigInfo_t *) raidPtr->Layout.layoutSpecificInfo;
diff --git a/sys/dev/raidframe/rf_declusterPQ.c b/sys/dev/raidframe/rf_declusterPQ.c
index c75d242e6ab..348936e6f26 100644
--- a/sys/dev/raidframe/rf_declusterPQ.c
+++ b/sys/dev/raidframe/rf_declusterPQ.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_declusterPQ.c,v 1.14 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_declusterPQ.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -35,7 +35,7 @@
*--------------------------------------------------*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.14 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -52,7 +52,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_declusterPQ.c,v 1.14 2006/10/12 01:31:50 christos
/* configuration code */
int
-rf_ConfigureDeclusteredPQ(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureDeclusteredPQ(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &(raidPtr->Layout);
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index cb141f52ea2..f779fa45d0b 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.47 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.48 2006/11/16 01:33:23 christos 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.47 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.48 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -179,7 +179,7 @@ rf_ConfigureDiskQueue(RF_Raid_t *raidPtr, RF_DiskQueue_t *diskqueue,
}
static void
-rf_ShutdownDiskQueueSystem(void *ignored __unused)
+rf_ShutdownDiskQueueSystem(void *ignored)
{
pool_destroy(&rf_pools.dqd);
}
diff --git a/sys/dev/raidframe/rf_disks.c b/sys/dev/raidframe/rf_disks.c
index 9f903a847b1..c2955c7f0f8 100644
--- a/sys/dev/raidframe/rf_disks.c
+++ b/sys/dev/raidframe/rf_disks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_disks.c,v 1.63 2006/10/12 01:31:50 christos Exp $ */
+/* $NetBSD: rf_disks.c,v 1.64 2006/11/16 01:33:23 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -67,7 +67,7 @@
***************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.63 2006/10/12 01:31:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_disks.c,v 1.64 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -111,7 +111,7 @@ static int rf_check_label_vitals( RF_Raid_t *, int, int, char *,
**************************************************************************/
int
-rf_ConfigureDisks(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureDisks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
RF_RaidDisk_t *disks;
@@ -235,7 +235,7 @@ fail:
* in row zero, which is specially expanded to hold them.
****************************************************************************/
int
-rf_ConfigureSpareDisks(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
+rf_ConfigureSpareDisks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
RF_Config_t *cfgPtr)
{
int i, ret;
@@ -316,7 +316,7 @@ fail:
}
static int
-rf_AllocDiskStructures(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr __unused)
+rf_AllocDiskStructures(RF_Raid_t *raidPtr, RF_Config_t *cfgPtr)
{
int ret;
@@ -1102,8 +1102,8 @@ rf_delete_component(RF_Raid_t *raidPtr, RF_SingleComponent_t *component)
}
int
-rf_incorporate_hot_spare(RF_Raid_t *raidPtr __unused,
- RF_SingleComponent_t *component __unused)
+rf_incorporate_hot_spare(RF_Raid_t *raidPtr,
+ RF_SingleComponent_t *component)
{
/* Issues here include how to 'move' this in if there is IO
diff --git a/sys/dev/raidframe/rf_driver.c b/sys/dev/raidframe/rf_driver.c
index 95f4f655d95..b89569b741e 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.112 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_driver.c,v 1.113 2006/11/16 01:33:23 christos 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.112 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_driver.c,v 1.113 2006/11/16 01:33:23 christos Exp $");
#include "opt_raid_diagnostic.h"
@@ -522,7 +522,7 @@ rf_FreeEmergBuffers(RF_Raid_t *raidPtr)
static void
-rf_ShutdownRDFreeList(void *ignored __unused)
+rf_ShutdownRDFreeList(void *ignored)
{
pool_destroy(&rf_pools.rad);
}
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index 66f78170ae1..b14342aee84 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.38 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_engine.c,v 1.39 2006/11/16 01:33:23 christos 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.38 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_engine.c,v 1.39 2006/11/16 01:33:23 christos Exp $");
#include <sys/errno.h>
@@ -124,7 +124,7 @@ rf_ShutdownEngine(void *arg)
int
rf_ConfigureEngine(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+ RF_Config_t *cfgPtr)
{
rf_mutex_init(&raidPtr->node_queue_mutex);
diff --git a/sys/dev/raidframe/rf_evenodd.c b/sys/dev/raidframe/rf_evenodd.c
index 4262914920a..c3942416fe0 100644
--- a/sys/dev/raidframe/rf_evenodd.c
+++ b/sys/dev/raidframe/rf_evenodd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_evenodd.c,v 1.17 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.17 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_evenodd.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -68,8 +68,8 @@ typedef struct RF_EvenOddConfigInfo_s {
} RF_EvenOddConfigInfo_t;
int
-rf_ConfigureEvenOdd(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureEvenOdd(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_EvenOddConfigInfo_t *info;
@@ -119,13 +119,13 @@ rf_ConfigureEvenOdd(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
}
int
-rf_GetDefaultNumFloatingReconBuffersEvenOdd(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersEvenOdd(RF_Raid_t *raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitEvenOdd(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultHeadSepLimitEvenOdd(RF_Raid_t *raidPtr)
{
return (10);
}
@@ -157,7 +157,7 @@ rf_IdentifyStripeEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
void
rf_MapParityEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col,
- RF_SectorNum_t *diskSector, int remap __unused)
+ RF_SectorNum_t *diskSector, int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_StripeNum_t endSUIDofthisStrip = (SUID / raidPtr->Layout.numDataCol + 1) * raidPtr->Layout.numDataCol - 1;
@@ -170,7 +170,7 @@ rf_MapParityEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapEEvenOdd(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_StripeNum_t endSUIDofthisStrip = (SUID / raidPtr->Layout.numDataCol + 1) * raidPtr->Layout.numDataCol - 1;
diff --git a/sys/dev/raidframe/rf_fifo.c b/sys/dev/raidframe/rf_fifo.c
index 5d1881b707f..5968100ca38 100644
--- a/sys/dev/raidframe/rf_fifo.c
+++ b/sys/dev/raidframe/rf_fifo.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_fifo.c,v 1.14 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_fifo.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
***************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.14 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: rf_fifo.c,v 1.14 2006/10/12 01:31:51 christos Exp $"
/* just malloc a header, zero it (via calloc), and return it */
/*ARGSUSED*/
void *
-rf_FifoCreate(RF_SectorCount_t sectPerDisk __unused, RF_AllocListElem_t *clList,
- RF_ShutdownList_t **listp __unused)
+rf_FifoCreate(RF_SectorCount_t sectPerDisk, RF_AllocListElem_t *clList,
+ RF_ShutdownList_t **listp)
{
RF_FifoHeader_t *q;
diff --git a/sys/dev/raidframe/rf_interdecluster.c b/sys/dev/raidframe/rf_interdecluster.c
index 4986c09cf96..fc6604a4d25 100644
--- a/sys/dev/raidframe/rf_interdecluster.c
+++ b/sys/dev/raidframe/rf_interdecluster.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_interdecluster.c,v 1.13 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_interdecluster.c,v 1.14 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.13 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_interdecluster.c,v 1.14 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -63,9 +63,9 @@ typedef struct RF_InterdeclusterConfigInfo_s {
int
rf_ConfigureInterDecluster(
- RF_ShutdownList_t ** listp __unused,
+ RF_ShutdownList_t ** listp,
RF_Raid_t * raidPtr,
- RF_Config_t * cfgPtr __unused)
+ RF_Config_t * cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_StripeCount_t num_used_stripeUnitsPerDisk;
@@ -121,7 +121,7 @@ rf_ConfigureInterDecluster(
}
int
-rf_GetDefaultNumFloatingReconBuffersInterDecluster(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersInterDecluster(RF_Raid_t * raidPtr)
{
return (30);
}
@@ -233,7 +233,7 @@ rf_IdentifyStripeInterDecluster(
void
rf_MapSIDToPSIDInterDecluster(
- RF_RaidLayout_t * layoutPtr __unused,
+ RF_RaidLayout_t * layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t * psID,
RF_ReconUnitNum_t * which_ru)
@@ -252,7 +252,7 @@ rf_MapSIDToPSIDInterDecluster(
void
rf_RAIDIDagSelect(
- RF_Raid_t * raidPtr __unused,
+ RF_Raid_t * raidPtr,
RF_IoType_t type,
RF_AccessStripeMap_t * asmap,
RF_VoidFuncPtr * createFunc)
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 62f349e5a92..94764bd78f0 100644
--- a/sys/dev/raidframe/rf_map.c
+++ b/sys/dev/raidframe/rf_map.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_map.c,v 1.41 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_map.c,v 1.42 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.41 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.42 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -339,7 +339,7 @@ rf_MarkFailuresInASMList(RF_Raid_t *raidPtr,
release all the free lists */
static void rf_ShutdownMapModule(void *);
static void
-rf_ShutdownMapModule(void *ignored __unused)
+rf_ShutdownMapModule(void *ignored)
{
pool_destroy(&rf_pools.asm_hdr);
pool_destroy(&rf_pools.asmap);
diff --git a/sys/dev/raidframe/rf_mcpair.c b/sys/dev/raidframe/rf_mcpair.c
index d550ba44281..23ab62cda9c 100644
--- a/sys/dev/raidframe/rf_mcpair.c
+++ b/sys/dev/raidframe/rf_mcpair.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_mcpair.c,v 1.20 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_mcpair.c,v 1.21 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.20 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.21 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -53,7 +53,7 @@ __KERNEL_RCSID(0, "$NetBSD: rf_mcpair.c,v 1.20 2006/10/12 01:31:51 christos Exp
static void rf_ShutdownMCPair(void *);
static void
-rf_ShutdownMCPair(void *ignored __unused)
+rf_ShutdownMCPair(void *ignored)
{
pool_destroy(&rf_pools.mcpair);
}
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 4d843493f38..e321604d05d 100644
--- a/sys/dev/raidframe/rf_netbsdkintf.c
+++ b/sys/dev/raidframe/rf_netbsdkintf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.221 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.222 2006/11/16 01:33:23 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -146,7 +146,7 @@
***********************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.221 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.222 2006/11/16 01:33:23 christos Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -409,7 +409,7 @@ raidattach(int num)
}
int
-rf_autoconfig(struct device *self __unused)
+rf_autoconfig(struct device *self)
{
RF_AutoConfig_t *ac_list;
RF_ConfigSet_t *config_sets;
@@ -536,16 +536,16 @@ raidsize(dev_t dev)
}
int
-raiddump(dev_t dev __unused, daddr_t blkno __unused, caddr_t va __unused,
- size_t size __unused)
+raiddump(dev_t dev, daddr_t blkno, caddr_t va,
+ size_t size)
{
/* Not implemented. */
return ENXIO;
}
/* ARGSUSED */
int
-raidopen(dev_t dev, int flags __unused, int fmt __unused,
- struct lwp *l __unused)
+raidopen(dev_t dev, int flags, int fmt,
+ struct lwp *l)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -624,7 +624,7 @@ bad:
}
/* ARGSUSED */
int
-raidclose(dev_t dev, int flags __unused, int fmt, struct lwp *l __unused)
+raidclose(dev_t dev, int flags, int fmt, struct lwp *l)
{
int unit = raidunit(dev);
struct cfdata *cf;
@@ -763,7 +763,7 @@ done:
}
/* ARGSUSED */
int
-raidread(dev_t dev, struct uio *uio, int flags __unused)
+raidread(dev_t dev, struct uio *uio, int flags)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -780,7 +780,7 @@ raidread(dev_t dev, struct uio *uio, int flags __unused)
}
/* ARGSUSED */
int
-raidwrite(dev_t dev, struct uio *uio, int flags __unused)
+raidwrite(dev_t dev, struct uio *uio, int flags)
{
int unit = raidunit(dev);
struct raid_softc *rs;
@@ -2271,7 +2271,7 @@ raidread_component_label(dev_t dev, struct vnode *b_vp,
}
/* ARGSUSED */
int
-raidwrite_component_label(dev_t dev, struct vnode *b_vp __unused,
+raidwrite_component_label(dev_t dev, struct vnode *b_vp,
RF_ComponentLabel_t *clabel)
{
struct buf *bp;
@@ -3084,7 +3084,7 @@ rf_have_enough_components(RF_ConfigSet_t *cset)
void
rf_create_configuration(RF_AutoConfig_t *ac, RF_Config_t *config,
- RF_Raid_t *raidPtr __unused)
+ RF_Raid_t *raidPtr)
{
RF_ComponentLabel_t *clabel;
int i;
@@ -3417,22 +3417,22 @@ rf_getdisksize(struct vnode *vp, struct lwp *l, RF_RaidDisk_t *diskPtr)
}
static int
-raid_match(struct device *self __unused, struct cfdata *cfdata __unused,
- void *aux __unused)
+raid_match(struct device *self, struct cfdata *cfdata,
+ void *aux)
{
return 1;
}
static void
-raid_attach(struct device *parent __unused, struct device *self __unused,
- void *aux __unused)
+raid_attach(struct device *parent, struct device *self,
+ void *aux)
{
}
static int
-raid_detach(struct device *self, int flags __unused)
+raid_detach(struct device *self, int flags)
{
struct raid_softc *rs = (struct raid_softc *)self;
diff --git a/sys/dev/raidframe/rf_nwayxor.c b/sys/dev/raidframe/rf_nwayxor.c
index 69bf70b4889..4322ad174a2 100644
--- a/sys/dev/raidframe/rf_nwayxor.c
+++ b/sys/dev/raidframe/rf_nwayxor.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_nwayxor.c,v 1.10 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_nwayxor.c,v 1.11 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -36,7 +36,7 @@
************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.10 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_nwayxor.c,v 1.11 2006/11/16 01:33:23 christos Exp $");
#include "rf_nwayxor.h"
#include "rf_shutdown.h"
@@ -45,7 +45,7 @@ static int callcount[10];
static void rf_ShutdownNWayXor(void *);
static void
-rf_ShutdownNWayXor(void *ignored __unused)
+rf_ShutdownNWayXor(void *ignored)
{
int i;
diff --git a/sys/dev/raidframe/rf_paritylogDiskMgr.c b/sys/dev/raidframe/rf_paritylogDiskMgr.c
index e22ceb1a631..e58b2a47956 100644
--- a/sys/dev/raidframe/rf_paritylogDiskMgr.c
+++ b/sys/dev/raidframe/rf_paritylogDiskMgr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_paritylogDiskMgr.c,v 1.20 2006/10/12 01:31:51 christos Exp $ */
+/* $NetBSD: rf_paritylogDiskMgr.c,v 1.21 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.20 2006/10/12 01:31:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogDiskMgr.c,v 1.21 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -376,7 +376,7 @@ static void
ReintegrateRegion(
RF_Raid_t * raidPtr,
RF_RegionId_t regionID,
- RF_ParityLog_t * coreLog __unused)
+ RF_ParityLog_t * coreLog)
{
RF_MCPair_t *rrd_mcpair = NULL, *prd_mcpair, *pwr_mcpair;
RF_DagHeader_t *rrd_dag_h = NULL, *prd_dag_h, *pwr_dag_h;
diff --git a/sys/dev/raidframe/rf_paritylogging.c b/sys/dev/raidframe/rf_paritylogging.c
index 11d9df2c1d1..26c16573c06 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.26 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_paritylogging.c,v 1.27 2006/11/16 01:33:23 christos 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.26 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_paritylogging.c,v 1.27 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -74,7 +74,7 @@ int
rf_ConfigureParityLogging(
RF_ShutdownList_t ** listp,
RF_Raid_t * raidPtr,
- RF_Config_t * cfgPtr __unused)
+ RF_Config_t * cfgPtr)
{
int i, j, startdisk, rc;
RF_SectorCount_t totalLogCapacity, fragmentation, lastRegionCapacity;
@@ -518,7 +518,7 @@ FreeRegionInfo(
static void
FreeParityLogQueue(
- RF_Raid_t * raidPtr __unused,
+ RF_Raid_t * raidPtr,
RF_ParityLogQueue_t * queue)
{
RF_ParityLog_t *l1, *l2;
@@ -677,13 +677,13 @@ rf_ShutdownParityLogging(RF_ThreadArg_t arg)
}
int
-rf_GetDefaultNumFloatingReconBuffersParityLogging(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersParityLogging(RF_Raid_t * raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitParityLogging(RF_Raid_t * raidPtr __unused)
+rf_GetDefaultHeadSepLimitParityLogging(RF_Raid_t * raidPtr)
{
return (10);
}
@@ -716,7 +716,7 @@ rf_MapSectorParityLogging(
RF_RaidAddr_t raidSector,
RF_RowCol_t * col,
RF_SectorNum_t * diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector /
raidPtr->Layout.sectorsPerStripeUnit;
@@ -736,7 +736,7 @@ rf_MapParityParityLogging(
RF_RaidAddr_t raidSector,
RF_RowCol_t * col,
RF_SectorNum_t * diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector /
raidPtr->Layout.sectorsPerStripeUnit;
@@ -799,7 +799,7 @@ rf_IdentifyStripeParityLogging(
void
rf_MapSIDToPSIDParityLogging(
- RF_RaidLayout_t * layoutPtr __unused,
+ RF_RaidLayout_t * layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t * psID,
RF_ReconUnitNum_t * which_ru)
diff --git a/sys/dev/raidframe/rf_parityloggingdags.c b/sys/dev/raidframe/rf_parityloggingdags.c
index 77ed63b2363..b6f13c20a5c 100644
--- a/sys/dev/raidframe/rf_parityloggingdags.c
+++ b/sys/dev/raidframe/rf_parityloggingdags.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityloggingdags.c,v 1.17 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_parityloggingdags.c,v 1.18 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.17 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityloggingdags.c,v 1.18 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
#include "opt_raid_diagnostic.h"
@@ -75,10 +75,10 @@ rf_CommonCreateParityLoggingLargeWriteDAG(
RF_Raid_t * raidPtr,
RF_AccessStripeMap_t * asmap,
RF_DagHeader_t * dag_h,
- void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
- int nfaults __unused,
+ int nfaults,
int (*redFunc) (RF_DagNode_t *))
{
RF_DagNode_t *nodes, *wndNodes, *rodNodes = NULL, *syncNode, *xorNode,
@@ -320,8 +320,8 @@ rf_CommonCreateParityLoggingSmallWriteDAG(
RF_Raid_t * raidPtr,
RF_AccessStripeMap_t * asmap,
RF_DagHeader_t * dag_h,
- void *bp __unused,
- RF_RaidAccessFlags_t flags __unused,
+ void *bp,
+ RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
const RF_RedFuncs_t * pfuncs,
const RF_RedFuncs_t * qfuncs)
@@ -626,8 +626,8 @@ rf_CreateParityLoggingSmallWriteDAG(
void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
- const RF_RedFuncs_t * pfuncs __unused,
- const RF_RedFuncs_t * qfuncs __unused)
+ const RF_RedFuncs_t * pfuncs,
+ const RF_RedFuncs_t * qfuncs)
{
dag_h->creator = "ParityLoggingSmallWriteDAG";
rf_CommonCreateParityLoggingSmallWriteDAG(raidPtr, asmap, dag_h, bp, flags, allocList, &rf_xorFuncs, NULL);
@@ -642,8 +642,8 @@ rf_CreateParityLoggingLargeWriteDAG(
void *bp,
RF_RaidAccessFlags_t flags,
RF_AllocListElem_t * allocList,
- int nfaults __unused,
- int (*redFunc) (RF_DagNode_t *) __unused)
+ int nfaults,
+ int (*redFunc) (RF_DagNode_t *))
{
dag_h->creator = "ParityLoggingSmallWriteDAG";
rf_CommonCreateParityLoggingLargeWriteDAG(raidPtr, asmap, dag_h, bp, flags, allocList, 1, rf_RegularXorFunc);
diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c
index c820e64eb44..fb423cde3f3 100644
--- a/sys/dev/raidframe/rf_parityscan.c
+++ b/sys/dev/raidframe/rf_parityscan.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_parityscan.c,v 1.31 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_parityscan.c,v 1.32 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.31 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.32 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -322,7 +322,7 @@ out:
int
rf_TryToRedirectPDA(RF_Raid_t *raidPtr, RF_PhysDiskAddr_t *pda,
- int parity __unused)
+ int parity)
{
if (raidPtr->Disks[pda->col].status == rf_ds_reconstructing) {
if (rf_CheckRUReconstructed(raidPtr->reconControl->reconMap, pda->startSector)) {
@@ -404,7 +404,7 @@ rf_MakeSimpleDAG(RF_Raid_t *raidPtr, int nNodes, int bytesPerSU, char *databuf,
int (*doFunc) (RF_DagNode_t * node),
int (*undoFunc) (RF_DagNode_t * node),
const char *name, RF_AllocListElem_t *alloclist,
- RF_RaidAccessFlags_t flags __unused, int priority __unused)
+ RF_RaidAccessFlags_t flags, int priority)
{
RF_DagHeader_t *dag_h;
RF_DagNode_t *nodes, *termNode, *blockNode, *unblockNode, *tmpNode;
diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c
index 30aff8884a0..3c77aec6355 100644
--- a/sys/dev/raidframe/rf_psstatus.c
+++ b/sys/dev/raidframe/rf_psstatus.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_psstatus.c,v 1.32 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_psstatus.c,v 1.33 2006/11/16 01:33:23 christos 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.32 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.33 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -67,7 +67,7 @@ RealPrintPSStatusTable(RF_Raid_t * raidPtr,
static void rf_ShutdownPSStatus(void *);
static void
-rf_ShutdownPSStatus(void *arg __unused)
+rf_ShutdownPSStatus(void *arg)
{
pool_destroy(&rf_pools.pss);
@@ -112,7 +112,7 @@ rf_MakeParityStripeStatusTable(RF_Raid_t *raidPtr)
}
void
-rf_FreeParityStripeStatusTable(RF_Raid_t *raidPtr __unused,
+rf_FreeParityStripeStatusTable(RF_Raid_t *raidPtr,
RF_PSStatusHeader_t *pssTable)
{
#if RF_DEBUG_PSS
@@ -262,7 +262,7 @@ rf_RemoveFromActiveReconTable(RF_Raid_t *raidPtr, RF_StripeNum_t psid,
}
RF_ReconParityStripeStatus_t *
-rf_AllocPSStatus(RF_Raid_t *raidPtr __unused)
+rf_AllocPSStatus(RF_Raid_t *raidPtr)
{
RF_ReconParityStripeStatus_t *p;
@@ -272,7 +272,7 @@ rf_AllocPSStatus(RF_Raid_t *raidPtr __unused)
}
void
-rf_FreePSStatus(RF_Raid_t *raidPtr __unused, RF_ReconParityStripeStatus_t *p)
+rf_FreePSStatus(RF_Raid_t *raidPtr, RF_ReconParityStripeStatus_t *p)
{
RF_ASSERT(p->procWaitList == NULL);
RF_ASSERT(p->blockWaitList == NULL);
diff --git a/sys/dev/raidframe/rf_raid0.c b/sys/dev/raidframe/rf_raid0.c
index f0cc136a322..8259b6bd94f 100644
--- a/sys/dev/raidframe/rf_raid0.c
+++ b/sys/dev/raidframe/rf_raid0.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid0.c,v 1.14 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid0.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.14 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid0.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -52,8 +52,8 @@ typedef struct RF_Raid0ConfigInfo_s {
} RF_Raid0ConfigInfo_t;
int
-rf_ConfigureRAID0(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID0(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid0ConfigInfo_t *info;
@@ -81,7 +81,7 @@ rf_ConfigureRAID0(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
void
rf_MapSectorRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
- RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap __unused)
+ RF_RowCol_t *col, RF_SectorNum_t *diskSector, int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
*col = SUID % raidPtr->numCol;
@@ -90,16 +90,16 @@ rf_MapSectorRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
}
void
-rf_MapParityRAID0(RF_Raid_t *raidPtr __unused,
- RF_RaidAddr_t raidSector __unused, RF_RowCol_t *col,
- RF_SectorNum_t *diskSector, int remap __unused)
+rf_MapParityRAID0(RF_Raid_t *raidPtr,
+ RF_RaidAddr_t raidSector, RF_RowCol_t *col,
+ RF_SectorNum_t *diskSector, int remap)
{
*col = 0;
*diskSector = 0;
}
void
-rf_IdentifyStripeRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
+rf_IdentifyStripeRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
RF_RowCol_t **diskids)
{
RF_Raid0ConfigInfo_t *info;
@@ -109,7 +109,7 @@ rf_IdentifyStripeRAID0(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
}
void
-rf_MapSIDToPSIDRAID0(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID0(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID, RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
*which_ru = 0;
@@ -120,7 +120,7 @@ void
rf_RAID0DagSelect(
RF_Raid_t * raidPtr,
RF_IoType_t type,
- RF_AccessStripeMap_t * asmap __unused,
+ RF_AccessStripeMap_t * asmap,
RF_VoidFuncPtr * createFunc)
{
if (raidPtr->numFailures > 0) {
@@ -132,9 +132,9 @@ rf_RAID0DagSelect(
}
int
-rf_VerifyParityRAID0(RF_Raid_t *raidPtr __unused,
- RF_RaidAddr_t raidAddr __unused, RF_PhysDiskAddr_t *parityPDA __unused,
- int correct_it __unused, RF_RaidAccessFlags_t flags __unused)
+rf_VerifyParityRAID0(RF_Raid_t *raidPtr,
+ RF_RaidAddr_t raidAddr, RF_PhysDiskAddr_t *parityPDA,
+ int correct_it, RF_RaidAccessFlags_t flags)
{
/*
* No parity is always okay.
diff --git a/sys/dev/raidframe/rf_raid1.c b/sys/dev/raidframe/rf_raid1.c
index 13a2a086234..abe5aeed745 100644
--- a/sys/dev/raidframe/rf_raid1.c
+++ b/sys/dev/raidframe/rf_raid1.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid1.c,v 1.28 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid1.c,v 1.29 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.28 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.29 2006/11/16 01:33:23 christos Exp $");
#include "rf_raid.h"
#include "rf_raid1.h"
@@ -58,8 +58,8 @@ typedef struct RF_Raid1ConfigInfo_s {
} RF_Raid1ConfigInfo_t;
/* start of day code specific to RAID level 1 */
int
-rf_ConfigureRAID1(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID1(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid1ConfigInfo_t *info;
@@ -97,7 +97,7 @@ rf_ConfigureRAID1(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
void
rf_MapSectorRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_RowCol_t mirrorPair = SUID % (raidPtr->numCol / 2);
@@ -115,7 +115,7 @@ rf_MapSectorRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapParityRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
RF_RowCol_t mirrorPair = SUID % (raidPtr->numCol / 2);
@@ -148,7 +148,7 @@ rf_IdentifyStripeRAID1(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
* maps a logical stripe to a stripe in the redundant array
*/
void
-rf_MapSIDToPSIDRAID1(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID1(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
diff --git a/sys/dev/raidframe/rf_raid4.c b/sys/dev/raidframe/rf_raid4.c
index 8826d0380b5..5d66cc8fe85 100644
--- a/sys/dev/raidframe/rf_raid4.c
+++ b/sys/dev/raidframe/rf_raid4.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid4.c,v 1.11 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid4.c,v 1.12 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.11 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid4.c,v 1.12 2006/11/16 01:33:23 christos Exp $");
#include "rf_raid.h"
#include "rf_dag.h"
@@ -54,8 +54,8 @@ typedef struct RF_Raid4ConfigInfo_s {
int
-rf_ConfigureRAID4(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID4(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid4ConfigInfo_t *info;
@@ -85,13 +85,13 @@ rf_ConfigureRAID4(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
}
int
-rf_GetDefaultNumFloatingReconBuffersRAID4(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersRAID4(RF_Raid_t *raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitRAID4(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultHeadSepLimitRAID4(RF_Raid_t *raidPtr)
{
return (20);
}
@@ -99,7 +99,7 @@ rf_GetDefaultHeadSepLimitRAID4(RF_Raid_t *raidPtr __unused)
void
rf_MapSectorRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
*col = SUID % raidPtr->Layout.numDataCol;
@@ -110,7 +110,7 @@ rf_MapSectorRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapParityRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
@@ -120,7 +120,7 @@ rf_MapParityRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
}
void
-rf_IdentifyStripeRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
+rf_IdentifyStripeRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
RF_RowCol_t **diskids)
{
RF_Raid4ConfigInfo_t *info = raidPtr->Layout.layoutSpecificInfo;
@@ -129,7 +129,7 @@ rf_IdentifyStripeRAID4(RF_Raid_t *raidPtr, RF_RaidAddr_t addr __unused,
}
void
-rf_MapSIDToPSIDRAID4(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID4(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
diff --git a/sys/dev/raidframe/rf_raid5.c b/sys/dev/raidframe/rf_raid5.c
index ae3f5d5a520..5e5c984f4b7 100644
--- a/sys/dev/raidframe/rf_raid5.c
+++ b/sys/dev/raidframe/rf_raid5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5.c,v 1.18 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid5.c,v 1.19 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*****************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.18 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5.c,v 1.19 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -55,8 +55,8 @@ typedef struct RF_Raid5ConfigInfo_s {
} RF_Raid5ConfigInfo_t;
int
-rf_ConfigureRAID5(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+rf_ConfigureRAID5(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
+ RF_Config_t *cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid5ConfigInfo_t *info;
@@ -95,13 +95,13 @@ rf_ConfigureRAID5(RF_ShutdownList_t **listp __unused, RF_Raid_t *raidPtr,
}
int
-rf_GetDefaultNumFloatingReconBuffersRAID5(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultNumFloatingReconBuffersRAID5(RF_Raid_t *raidPtr)
{
return (20);
}
RF_HeadSepLimit_t
-rf_GetDefaultHeadSepLimitRAID5(RF_Raid_t *raidPtr __unused)
+rf_GetDefaultHeadSepLimitRAID5(RF_Raid_t *raidPtr)
{
return (10);
}
@@ -117,7 +117,7 @@ rf_ShutdownRAID5(RF_Raid_t *raidPtr)
void
rf_MapSectorRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
*col = (SUID % raidPtr->numCol);
@@ -128,7 +128,7 @@ rf_MapSectorRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
void
rf_MapParityRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t raidSector,
RF_RowCol_t *col, RF_SectorNum_t *diskSector,
- int remap __unused)
+ int remap)
{
RF_StripeNum_t SUID = raidSector / raidPtr->Layout.sectorsPerStripeUnit;
@@ -148,7 +148,7 @@ rf_IdentifyStripeRAID5(RF_Raid_t *raidPtr, RF_RaidAddr_t addr,
}
void
-rf_MapSIDToPSIDRAID5(RF_RaidLayout_t *layoutPtr __unused,
+rf_MapSIDToPSIDRAID5(RF_RaidLayout_t *layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t *psID, RF_ReconUnitNum_t *which_ru)
{
diff --git a/sys/dev/raidframe/rf_raid5_rotatedspare.c b/sys/dev/raidframe/rf_raid5_rotatedspare.c
index 45762890ea1..e0ef2822a32 100644
--- a/sys/dev/raidframe/rf_raid5_rotatedspare.c
+++ b/sys/dev/raidframe/rf_raid5_rotatedspare.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid5_rotatedspare.c,v 1.11 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_raid5_rotatedspare.c,v 1.12 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
**************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.11 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid5_rotatedspare.c,v 1.12 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
@@ -55,9 +55,9 @@ typedef struct RF_Raid5RSConfigInfo_s {
int
rf_ConfigureRAID5_RS(
- RF_ShutdownList_t ** listp __unused,
+ RF_ShutdownList_t ** listp,
RF_Raid_t * raidPtr,
- RF_Config_t * cfgPtr __unused)
+ RF_Config_t * cfgPtr)
{
RF_RaidLayout_t *layoutPtr = &raidPtr->Layout;
RF_Raid5RSConfigInfo_t *info;
@@ -158,7 +158,7 @@ rf_IdentifyStripeRAID5_RS(
void
rf_MapSIDToPSIDRAID5_RS(
- RF_RaidLayout_t * layoutPtr __unused,
+ RF_RaidLayout_t * layoutPtr,
RF_StripeNum_t stripeID,
RF_StripeNum_t * psID,
RF_ReconUnitNum_t * which_ru)
diff --git a/sys/dev/raidframe/rf_reconmap.c b/sys/dev/raidframe/rf_reconmap.c
index 2104355ab9b..4522494c64e 100644
--- a/sys/dev/raidframe/rf_reconmap.c
+++ b/sys/dev/raidframe/rf_reconmap.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconmap.c,v 1.28 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_reconmap.c,v 1.29 2006/11/16 01:33:23 christos 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.28 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconmap.c,v 1.29 2006/11/16 01:33:23 christos Exp $");
#include "rf_raid.h"
#include <sys/time.h>
@@ -200,7 +200,7 @@ rf_ReconMapUpdate(RF_Raid_t *raidPtr, RF_ReconMap_t *mapPtr,
*-------------------------------------------------------------------------*/
static void
-compact_stat_entry(RF_Raid_t *raidPtr __unused, RF_ReconMap_t *mapPtr, int i)
+compact_stat_entry(RF_Raid_t *raidPtr, RF_ReconMap_t *mapPtr, int i)
{
RF_SectorCount_t sectorsPerReconUnit = mapPtr->sectorsPerReconUnit;
RF_ReconMapListElem_t *p = mapPtr->status[i];
diff --git a/sys/dev/raidframe/rf_reconstruct.c b/sys/dev/raidframe/rf_reconstruct.c
index a7e239ea9cf..0d5ad1084f9 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.94 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_reconstruct.c,v 1.95 2006/11/16 01:33:23 christos 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.94 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconstruct.c,v 1.95 2006/11/16 01:33:23 christos Exp $");
#include <sys/time.h>
#include <sys/buf.h>
@@ -142,7 +142,7 @@ struct RF_ReconDoneProc_s {
*
**************************************************************************/
static void
-rf_ShutdownReconstruction(void *ignored __unused)
+rf_ShutdownReconstruction(void *ignored)
{
pool_destroy(&rf_pools.reconbuffer);
}
@@ -1464,7 +1464,7 @@ ReconWriteDoneProc(void *arg, int status)
* be woken as a result
*/
static void
-CheckForNewMinHeadSep(RF_Raid_t *raidPtr, RF_HeadSepLimit_t hsCtr __unused)
+CheckForNewMinHeadSep(RF_Raid_t *raidPtr, RF_HeadSepLimit_t hsCtr)
{
RF_ReconCtrl_t *reconCtrlPtr = raidPtr->reconControl;
RF_HeadSepLimit_t new_min;
@@ -1522,8 +1522,8 @@ CheckForNewMinHeadSep(RF_Raid_t *raidPtr, RF_HeadSepLimit_t hsCtr __unused)
*/
static int
CheckHeadSeparation(RF_Raid_t *raidPtr, RF_PerDiskReconCtrl_t *ctrl,
- RF_RowCol_t col, RF_HeadSepLimit_t hsCtr __unused,
- RF_ReconUnitNum_t which_ru __unused)
+ RF_RowCol_t col, RF_HeadSepLimit_t hsCtr,
+ RF_ReconUnitNum_t which_ru)
{
RF_ReconCtrl_t *reconCtrlPtr = raidPtr->reconControl;
RF_CallbackDesc_t *cb, *p, *pt;
@@ -1590,12 +1590,12 @@ CheckHeadSeparation(RF_Raid_t *raidPtr, RF_PerDiskReconCtrl_t *ctrl,
* ASSUMES THE PSS MUTEX IS LOCKED UPON ENTRY
*/
static int
-CheckForcedOrBlockedReconstruction(RF_Raid_t *raidPtr __unused,
+CheckForcedOrBlockedReconstruction(RF_Raid_t *raidPtr,
RF_ReconParityStripeStatus_t *pssPtr,
- RF_PerDiskReconCtrl_t *ctrl __unused,
+ RF_PerDiskReconCtrl_t *ctrl,
RF_RowCol_t col,
- RF_StripeNum_t psid __unused,
- RF_ReconUnitNum_t which_ru __unused)
+ RF_StripeNum_t psid,
+ RF_ReconUnitNum_t which_ru)
{
RF_CallbackDesc_t *cb;
int retcode = 0;
diff --git a/sys/dev/raidframe/rf_revent.c b/sys/dev/raidframe/rf_revent.c
index 39748d23dd2..cb2622b0d4c 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.23 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_revent.c,v 1.24 2006/11/16 01:33:23 christos 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.23 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_revent.c,v 1.24 2006/11/16 01:33:23 christos Exp $");
#include <sys/errno.h>
@@ -52,7 +52,7 @@ static void rf_ShutdownReconEvent(void *);
static RF_ReconEvent_t *
GetReconEventDesc(RF_RowCol_t col, void *arg, RF_Revent_t type);
-static void rf_ShutdownReconEvent(void *ignored __unused)
+static void rf_ShutdownReconEvent(void *ignored)
{
pool_destroy(&rf_pools.revent);
}
diff --git a/sys/dev/raidframe/rf_sstf.c b/sys/dev/raidframe/rf_sstf.c
index 3e1ac954b32..63c724bc563 100644
--- a/sys/dev/raidframe/rf_sstf.c
+++ b/sys/dev/raidframe/rf_sstf.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_sstf.c,v 1.14 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_sstf.c,v 1.15 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
******************************************************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.14 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_sstf.c,v 1.15 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -247,9 +247,9 @@ closest_to_arm(queue, arm_pos, dir, allow_reverse)
void *
rf_SstfCreate(
- RF_SectorCount_t sect_per_disk __unused,
+ RF_SectorCount_t sect_per_disk,
RF_AllocListElem_t *cl_list,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_Sstf_t *sstfq;
@@ -261,9 +261,9 @@ rf_SstfCreate(
void *
rf_ScanCreate(
- RF_SectorCount_t sect_per_disk __unused,
+ RF_SectorCount_t sect_per_disk,
RF_AllocListElem_t *cl_list,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_Sstf_t *scanq;
@@ -275,9 +275,9 @@ rf_ScanCreate(
void *
rf_CscanCreate(
- RF_SectorCount_t sect_per_disk __unused,
+ RF_SectorCount_t sect_per_disk,
RF_AllocListElem_t *cl_list,
- RF_ShutdownList_t **listp __unused)
+ RF_ShutdownList_t **listp)
{
RF_Sstf_t *cscanq;
diff --git a/sys/dev/raidframe/rf_stripelocks.c b/sys/dev/raidframe/rf_stripelocks.c
index a8c667e114c..de1f797fbbc 100644
--- a/sys/dev/raidframe/rf_stripelocks.c
+++ b/sys/dev/raidframe/rf_stripelocks.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_stripelocks.c,v 1.28 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_stripelocks.c,v 1.29 2006/11/16 01:33:23 christos 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.28 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_stripelocks.c,v 1.29 2006/11/16 01:33:23 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -158,7 +158,7 @@ static void rf_ShutdownStripeLockFreeList(void *);
static void rf_RaidShutdownStripeLocks(void *);
static void
-rf_ShutdownStripeLockFreeList(void *ignored __unused)
+rf_ShutdownStripeLockFreeList(void *ignored)
{
pool_destroy(&rf_pools.stripelock);
}
@@ -220,7 +220,7 @@ rf_RaidShutdownStripeLocks(void *arg)
int
rf_ConfigureStripeLocks(RF_ShutdownList_t **listp, RF_Raid_t *raidPtr,
- RF_Config_t *cfgPtr __unused)
+ RF_Config_t *cfgPtr)
{
raidPtr->lockTable = rf_MakeLockTable();
diff --git a/sys/dev/raidframe/rf_utils.c b/sys/dev/raidframe/rf_utils.c
index ff3bd61394c..015bd8525aa 100644
--- a/sys/dev/raidframe/rf_utils.c
+++ b/sys/dev/raidframe/rf_utils.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_utils.c,v 1.15 2006/10/12 01:31:52 christos Exp $ */
+/* $NetBSD: rf_utils.c,v 1.16 2006/11/16 01:33:23 christos Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
****************************************/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.15 2006/10/12 01:31:52 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_utils.c,v 1.16 2006/11/16 01:33:23 christos Exp $");
#include "rf_archs.h"
#include "rf_utils.h"
@@ -57,7 +57,7 @@ rf_make_2d_array(int b, int k, RF_AllocListElem_t *allocList)
#if (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0)
void
-rf_free_2d_array(RF_RowCol_t **a, int b, int k __unused)
+rf_free_2d_array(RF_RowCol_t **a, int b, int k)
{
RF_RowCol_t i;
@@ -79,7 +79,7 @@ rf_make_1d_array(int c, RF_AllocListElem_t *allocList)
}
void
-rf_free_1d_array(RF_RowCol_t *a, int n __unused)
+rf_free_1d_array(RF_RowCol_t *a, int n)
{
RF_Free(a, n * sizeof(RF_RowCol_t));
}