summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authoroster <oster@NetBSD.org>2003-12-31 00:00:06 +0000
committeroster <oster@NetBSD.org>2003-12-31 00:00:06 +0000
commit4635d077cffeca0c262f603edb0e9e084b6ff467 (patch)
tree554051c0776cc7e9dc04986246600f5db0eb109f /sys/dev/raidframe
parentd721fc82ce9a1504eebbcd1fedb0fa9cef52c6f7 (diff)
nuke the 'bp' argument to rf_bxor and friends since it is no longer used.
In fact, bp was being set to "NULL" when passed rf_bxor() in rf_parityscan.c:rf_VerifyParityBasic().
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.c21
-rw-r--r--sys/dev/raidframe/rf_dagfuncs.h8
-rw-r--r--sys/dev/raidframe/rf_parityscan.c6
3 files changed, 17 insertions, 18 deletions
diff --git a/sys/dev/raidframe/rf_dagfuncs.c b/sys/dev/raidframe/rf_dagfuncs.c
index 2a31198d2e3..272221fab2f 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.16 2003/12/30 23:40:20 oster Exp $ */
+/* $NetBSD: rf_dagfuncs.c,v 1.17 2003/12/31 00:00:06 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.16 2003/12/30 23:40:20 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagfuncs.c,v 1.17 2003/12/31 00:00:06 oster Exp $");
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -475,7 +475,7 @@ rf_RegularXorFunc(RF_DagNode_t *node)
for (i = 0; i < node->numParams - 1; i += 2)
if (node->params[i + 1].p != node->results[0]) {
retcode = rf_XorIntoBuffer(raidPtr, (RF_PhysDiskAddr_t *) node->params[i].p,
- (char *) node->params[i + 1].p, (char *) node->results[0], node->dagHdr->bp);
+ (char *) node->params[i + 1].p, (char *) node->results[0]);
}
RF_ETIMER_STOP(timer);
RF_ETIMER_EVAL(timer);
@@ -500,8 +500,7 @@ rf_SimpleXorFunc(RF_DagNode_t *node)
for (i = 0; i < node->numParams - 1; i += 2)
if (node->params[i + 1].p != node->results[0]) {
retcode = rf_bxor((char *) node->params[i + 1].p, (char *) node->results[0],
- rf_RaidAddressToByte(raidPtr, ((RF_PhysDiskAddr_t *) node->params[i].p)->numSector),
- (struct buf *) node->dagHdr->bp);
+ rf_RaidAddressToByte(raidPtr, ((RF_PhysDiskAddr_t *) node->params[i].p)->numSector));
}
RF_ETIMER_STOP(timer);
RF_ETIMER_EVAL(timer);
@@ -539,7 +538,7 @@ rf_RecoveryXorFunc(RF_DagNode_t *node)
srcbuf = (char *) node->params[i + 1].p;
suoffset = rf_StripeUnitOffset(layoutPtr, pda->startSector);
destbuf = ((char *) node->results[0]) + rf_RaidAddressToByte(raidPtr, suoffset - failedSUOffset);
- retcode = rf_bxor(srcbuf, destbuf, rf_RaidAddressToByte(raidPtr, pda->numSector), node->dagHdr->bp);
+ retcode = rf_bxor(srcbuf, destbuf, rf_RaidAddressToByte(raidPtr, pda->numSector));
}
RF_ETIMER_STOP(timer);
RF_ETIMER_EVAL(timer);
@@ -564,7 +563,7 @@ rf_RecoveryXorFunc(RF_DagNode_t *node)
int
rf_XorIntoBuffer(RF_Raid_t *raidPtr, RF_PhysDiskAddr_t *pda,
- char *srcbuf, char *targbuf, void *bp)
+ char *srcbuf, char *targbuf)
{
char *targptr;
int sectPerSU = raidPtr->Layout.sectorsPerStripeUnit;
@@ -575,7 +574,7 @@ rf_XorIntoBuffer(RF_Raid_t *raidPtr, RF_PhysDiskAddr_t *pda,
targptr = targbuf + rf_RaidAddressToByte(raidPtr, SUOffset);
length = rf_RaidAddressToByte(raidPtr, pda->numSector);
- retcode = rf_bxor(srcbuf, targptr, length, bp);
+ retcode = rf_bxor(srcbuf, targptr, length);
return (retcode);
}
/* it really should be the case that the buffer pointers (returned by
@@ -584,7 +583,7 @@ rf_XorIntoBuffer(RF_Raid_t *raidPtr, RF_PhysDiskAddr_t *pda,
* a multiple of the sector size, so there should be no problem with
* leftover bytes at the end. */
int
-rf_bxor(char *src, char *dest, int len, void *bp)
+rf_bxor(char *src, char *dest, int len)
{
unsigned mask = sizeof(long) - 1, retcode = 0;
@@ -592,7 +591,7 @@ rf_bxor(char *src, char *dest, int len, void *bp)
!(((unsigned long) dest) & mask) && !(len & mask)) {
retcode = rf_longword_bxor((unsigned long *) src,
(unsigned long *) dest,
- len >> RF_LONGSHIFT, bp);
+ len >> RF_LONGSHIFT);
} else {
RF_ASSERT(0);
}
@@ -609,7 +608,7 @@ rf_bxor(char *src, char *dest, int len, void *bp)
* len - is in longwords
*/
int
-rf_longword_bxor(unsigned long *src, unsigned long *dest, int len, void *bp)
+rf_longword_bxor(unsigned long *src, unsigned long *dest, int len)
{
unsigned long *end = src + len;
unsigned long d0, d1, d2, d3, s0, s1, s2, s3; /* temps */
diff --git a/sys/dev/raidframe/rf_dagfuncs.h b/sys/dev/raidframe/rf_dagfuncs.h
index df515e096b7..d9953d72377 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.4 2000/03/30 13:39:07 oster Exp $ */
+/* $NetBSD: rf_dagfuncs.h,v 1.5 2003/12/31 00:00:06 oster Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -57,10 +57,10 @@ int rf_SimpleXorFunc(RF_DagNode_t * node);
int rf_RecoveryXorFunc(RF_DagNode_t * node);
int
rf_XorIntoBuffer(RF_Raid_t * raidPtr, RF_PhysDiskAddr_t * pda, char *srcbuf,
- char *targbuf, void *bp);
-int rf_bxor(char *src, char *dest, int len, void *bp);
+ char *targbuf);
+int rf_bxor(char *src, char *dest, int len);
int
-rf_longword_bxor(unsigned long *src, unsigned long *dest, int len, void *bp);
+rf_longword_bxor(unsigned long *src, unsigned long *dest, int len);
int
rf_longword_bxor3(unsigned long *dest, unsigned long *a, unsigned long *b,
unsigned long *c, int len, void *bp);
diff --git a/sys/dev/raidframe/rf_parityscan.c b/sys/dev/raidframe/rf_parityscan.c
index cb67aca7cd5..43882f45dd5 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.20 2003/12/29 03:33:48 oster Exp $ */
+/* $NetBSD: rf_parityscan.c,v 1.21 2003/12/31 00:00:06 oster 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.20 2003/12/29 03:33:48 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_parityscan.c,v 1.21 2003/12/31 00:00:06 oster Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -263,7 +263,7 @@ rf_VerifyParityBasic(raidPtr, raidAddr, parityPDA, correct_it, flags)
goto out;
}
for (p = buf; p < end_p; p += numbytes) {
- rf_bxor(p, pbuf, numbytes, NULL);
+ rf_bxor(p, pbuf, numbytes);
}
for (i = 0; i < numbytes; i++) {
if (pbuf[i] != buf[bytesPerStripe + i]) {