summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_dagffwr.c14
-rw-r--r--sys/dev/raidframe/rf_dagutils.c8
-rw-r--r--sys/dev/raidframe/rf_dagutils.h4
3 files changed, 11 insertions, 15 deletions
diff --git a/sys/dev/raidframe/rf_dagffwr.c b/sys/dev/raidframe/rf_dagffwr.c
index 87f077be7ea..e0e9ce7c79a 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.20 2004/03/06 23:34:27 oster Exp $ */
+/* $NetBSD: rf_dagffwr.c,v 1.21 2004/03/06 23:52:20 oster 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.20 2004/03/06 23:34:27 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagffwr.c,v 1.21 2004/03/06 23:52:20 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -608,8 +608,7 @@ rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
/* physical disk addr desc */
readDataNodes[i].params[0].p = pda;
/* buffer to hold old data */
- readDataNodes[i].params[1].p = rf_AllocBuffer(raidPtr,
- dag_h, pda, allocList);
+ readDataNodes[i].params[1].p = rf_AllocBuffer(raidPtr, pda, allocList);
readDataNodes[i].params[2].v = parityStripeID;
readDataNodes[i].params[3].v = RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY,
which_ru);
@@ -630,8 +629,7 @@ rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
dag_h, "Rop", allocList);
readParityNodes[i].params[0].p = pda;
/* buffer to hold old parity */
- readParityNodes[i].params[1].p = rf_AllocBuffer(raidPtr,
- dag_h, pda, allocList);
+ readParityNodes[i].params[1].p = rf_AllocBuffer(raidPtr, pda, allocList);
readParityNodes[i].params[2].v = parityStripeID;
readParityNodes[i].params[3].v = RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY,
which_ru);
@@ -653,9 +651,7 @@ rf_CommonCreateSmallWriteDAG(RF_Raid_t *raidPtr, RF_AccessStripeMap_t *asmap,
1, 4, 0, dag_h, "Roq", allocList);
readQNodes[i].params[0].p = pda;
/* buffer to hold old Q */
- readQNodes[i].params[1].p = rf_AllocBuffer(raidPtr,
- dag_h, pda,
- allocList);
+ readQNodes[i].params[1].p = rf_AllocBuffer(raidPtr, pda, allocList);
readQNodes[i].params[2].v = parityStripeID;
readQNodes[i].params[3].v = RF_CREATE_PARAM3(RF_IO_NORMAL_PRIORITY,
which_ru);
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index d6de7e4f3e9..46cc9abbe2a 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.32 2004/03/06 22:59:42 oster Exp $ */
+/* $NetBSD: rf_dagutils.c,v 1.33 2004/03/06 23:52:20 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.32 2004/03/06 22:59:42 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.33 2004/03/06 23:52:20 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -269,8 +269,8 @@ rf_FreeFuncList(RF_FuncList_t *funcList)
/* allocates a buffer big enough to hold the data described by pda */
void *
-rf_AllocBuffer(RF_Raid_t *raidPtr, RF_DagHeader_t *dag_h,
- RF_PhysDiskAddr_t *pda, RF_AllocListElem_t *allocList)
+rf_AllocBuffer(RF_Raid_t *raidPtr, RF_PhysDiskAddr_t *pda,
+ RF_AllocListElem_t *allocList)
{
char *p;
diff --git a/sys/dev/raidframe/rf_dagutils.h b/sys/dev/raidframe/rf_dagutils.h
index 7f17ed9bbe6..1766c2d7721 100644
--- a/sys/dev/raidframe/rf_dagutils.h
+++ b/sys/dev/raidframe/rf_dagutils.h
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_dagutils.h,v 1.9 2004/02/29 01:24:34 oster Exp $ */
+/* $NetBSD: rf_dagutils.h,v 1.10 2004/03/06 23:52:20 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -79,7 +79,7 @@ void rf_FreeDAGList(RF_DagList_t *);
RF_FuncList_t *rf_AllocFuncList(void);
void rf_FreeFuncList(RF_FuncList_t *);
-void *rf_AllocBuffer(RF_Raid_t * raidPtr, RF_DagHeader_t * dag_h,
+void *rf_AllocBuffer(RF_Raid_t * raidPtr,
RF_PhysDiskAddr_t * pda,
RF_AllocListElem_t * allocList);