summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2004-01-10 17:04:44 +0000
committeroster <oster@NetBSD.org>2004-01-10 17:04:44 +0000
commit6297e36a60c51148bd5f5756728153adaa45e037 (patch)
tree87e466dbfc3b97ef06848b722cd323e98274d3fe /sys/dev/raidframe
parent90b9a619283b2c5a49c2ecf3a67357ab48756223 (diff)
Since the LOCK and UNLOCK flags are never used, no need in extracting them.
Collapse the related variables down to zero. That means 'flags' is 0 as well. Nuke the extraction macros, a bunch of the variables, and replace 'flags' as well.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.c21
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.h4
-rw-r--r--sys/dev/raidframe/rf_dagutils.c12
3 files changed, 11 insertions, 26 deletions
diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c
index 272221fab2f..cb78b84ef6a 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.17 2003/12/31 00:00:06 oster Exp $ */
+/* $NetBSD: rf_dagfuncs.c,v 1.18 2004/01/10 17:04:44 oster 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.17 2003/12/31 00:00:06 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.18 2004/01/10 17:04:44 oster Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -267,10 +267,7 @@ rf_DiskReadFuncForThreads(RF_DagNode_t *node)
caddr_t buf = (caddr_t) node->params[1].p;
RF_StripeNum_t parityStripeID = (RF_StripeNum_t) node->params[2].v;
unsigned priority = RF_EXTRACT_PRIORITY(node->params[3].v);
- unsigned lock = RF_EXTRACT_LOCK_FLAG(node->params[3].v);
- unsigned unlock = RF_EXTRACT_UNLOCK_FLAG(node->params[3].v);
unsigned which_ru = RF_EXTRACT_RU(node->params[3].v);
- RF_DiskQueueDataFlags_t flags = 0;
RF_IoType_t iotype = (node->dagHdr->status == rf_enable) ? RF_IO_TYPE_READ : RF_IO_TYPE_NOP;
RF_DiskQueue_t *dqs = ((RF_Raid_t *) (node->dagHdr->raidPtr))->Queues;
void *b_proc = NULL;
@@ -278,15 +275,11 @@ rf_DiskReadFuncForThreads(RF_DagNode_t *node)
if (node->dagHdr->bp)
b_proc = (void *) ((struct buf *) node->dagHdr->bp)->b_proc;
- RF_ASSERT(!(lock && unlock));
- flags |= (lock) ? RF_LOCK_DISK_QUEUE : 0;
- flags |= (unlock) ? RF_UNLOCK_DISK_QUEUE : 0;
-
req = rf_CreateDiskQueueData(iotype, pda->startSector, pda->numSector,
buf, parityStripeID, which_ru,
(int (*) (void *, int)) node->wakeFunc,
node, NULL, node->dagHdr->tracerec,
- (void *) (node->dagHdr->raidPtr), flags, b_proc);
+ (void *) (node->dagHdr->raidPtr), 0, b_proc);
if (!req) {
(node->wakeFunc) (node, ENOMEM);
} else {
@@ -308,10 +301,7 @@ rf_DiskWriteFuncForThreads(RF_DagNode_t *node)
caddr_t buf = (caddr_t) node->params[1].p;
RF_StripeNum_t parityStripeID = (RF_StripeNum_t) node->params[2].v;
unsigned priority = RF_EXTRACT_PRIORITY(node->params[3].v);
- unsigned lock = RF_EXTRACT_LOCK_FLAG(node->params[3].v);
- unsigned unlock = RF_EXTRACT_UNLOCK_FLAG(node->params[3].v);
unsigned which_ru = RF_EXTRACT_RU(node->params[3].v);
- RF_DiskQueueDataFlags_t flags = 0;
RF_IoType_t iotype = (node->dagHdr->status == rf_enable) ? RF_IO_TYPE_WRITE : RF_IO_TYPE_NOP;
RF_DiskQueue_t *dqs = ((RF_Raid_t *) (node->dagHdr->raidPtr))->Queues;
void *b_proc = NULL;
@@ -320,16 +310,13 @@ rf_DiskWriteFuncForThreads(RF_DagNode_t *node)
b_proc = (void *) ((struct buf *) node->dagHdr->bp)->b_proc;
/* normal processing (rollaway or forward recovery) begins here */
- RF_ASSERT(!(lock && unlock));
- flags |= (lock) ? RF_LOCK_DISK_QUEUE : 0;
- flags |= (unlock) ? RF_UNLOCK_DISK_QUEUE : 0;
req = rf_CreateDiskQueueData(iotype, pda->startSector, pda->numSector,
buf, parityStripeID, which_ru,
(int (*) (void *, int)) node->wakeFunc,
(void *) node, NULL,
node->dagHdr->tracerec,
(void *) (node->dagHdr->raidPtr),
- flags, b_proc);
+ 0, b_proc);
if (!req) {
(node->wakeFunc) (node, ENOMEM);
diff --git a/sys/dev/raidframe/rf_dagfuncs.h b/sys/dev/raidframe/rf_dagfuncs.h
index ceaa1bb6d2a..2126917b8a0 100644
--- a/sys/dev/raidframe/rf_dagfuncs.h
+++ b/sys/dev/raidframe/rf_dagfuncs.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagfuncs.h,v 1.6 2004/01/10 00:56:28 oster Exp $ */
+/* $NetBSD: rf_dagfuncs.h,v 1.7 2004/01/10 17:04:44 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -82,8 +82,6 @@ extern int (*rf_RecoveryXorUndoFunc) (RF_DagNode_t *);
/* macros for manipulating the param[3] in a read or write node */
#define RF_CREATE_PARAM3(pri, wru) (((RF_uint64)(((wru&0xFFFFFF)<<8)|((pri)&0xF)) ))
#define RF_EXTRACT_PRIORITY(_x_) ((((unsigned) ((unsigned long)(_x_))) >> 0) & 0x0F)
-#define RF_EXTRACT_LOCK_FLAG(_x_) ((((unsigned) ((unsigned long)(_x_))) >> 4) & 0x1)
-#define RF_EXTRACT_UNLOCK_FLAG(_x_) ((((unsigned) ((unsigned long)(_x_))) >> 5) & 0x1)
#define RF_EXTRACT_RU(_x_) ((((unsigned) ((unsigned long)(_x_))) >> 8) & 0xFFFFFF)
#endif /* !_RF__RF_DAGFUNCS_H_ */
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index 2229d45a18d..584990b4821 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.23 2003/12/30 21:59:03 oster Exp $ */
+/* $NetBSD: rf_dagutils.c,v 1.24 2004/01/10 17:04:44 oster 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.23 2003/12/30 21:59:03 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.24 2004/01/10 17:04:44 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -261,8 +261,8 @@ rf_PrintNodeInfoString(RF_DagNode_t *node)
|| (df == rf_DiskReadMirrorPartitionFunc)) {
pda = (RF_PhysDiskAddr_t *) node->params[0].p;
bufPtr = (void *) node->params[1].p;
- lk = RF_EXTRACT_LOCK_FLAG(node->params[3].v);
- unlk = RF_EXTRACT_UNLOCK_FLAG(node->params[3].v);
+ lk = 0;
+ unlk = 0;
RF_ASSERT(!(lk && unlk));
printf("c %d offs %ld nsect %d buf 0x%lx %s\n", pda->col,
(long) pda->startSector, (int) pda->numSector, (long) bufPtr,
@@ -271,8 +271,8 @@ rf_PrintNodeInfoString(RF_DagNode_t *node)
}
if (df == rf_DiskUnlockFunc) {
pda = (RF_PhysDiskAddr_t *) node->params[0].p;
- lk = RF_EXTRACT_LOCK_FLAG(node->params[3].v);
- unlk = RF_EXTRACT_UNLOCK_FLAG(node->params[3].v);
+ lk = 0;
+ unlk = 0;
RF_ASSERT(!(lk && unlk));
printf("c %d %s\n", pda->col,
(lk) ? "LOCK" : ((unlk) ? "UNLK" : "nop"));