summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe/rf_map.c
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2019-02-09 03:33:59 +0000
committerchristos <christos@NetBSD.org>2019-02-09 03:33:59 +0000
commitf9496794ff5670818d14b58cb9ffda8f702eaed7 (patch)
tree44b46fe0fb83d0c2f7514745778b296e33474227 /sys/dev/raidframe/rf_map.c
parent96d63dcbe0bd602859527fcd9c280042831fea01 (diff)
- Change the allocation macros to be more like function calls
- Change sizeof(type) -> sizeof(*variable) - Use macros for the long buffer length allocations - Remove "bit polishing" memsets() -- do them only once - Remove unnecessary casts Thanks to oster@ for finding bugs and testing.
Diffstat (limited to 'sys/dev/raidframe/rf_map.c')
-rw-r--r--sys/dev/raidframe/rf_map.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 2927bcc44e8..79932701a84 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.47 2016/10/15 20:31:15 oster Exp $ */
+/* $NetBSD: rf_map.c,v 1.48 2019/02/09 03:34:00 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.47 2016/10/15 20:31:15 oster Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.48 2019/02/09 03:34:00 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -129,7 +129,7 @@ rf_MapAccess(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddress,
RF_ASSERT(asmList);
t_asm = asmList;
asmList = asmList->next;
- memset((char *) t_asm, 0, sizeof(RF_AccessStripeMap_t));
+ memset(t_asm, 0, sizeof(*t_asm));
if (!asm_p)
asm_list = asm_p = t_asm;
else {
@@ -157,7 +157,7 @@ rf_MapAccess(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddress,
RF_ASSERT(pdaList);
t_pda = pdaList;
pdaList = pdaList->next;
- memset((char *) t_pda, 0, sizeof(RF_PhysDiskAddr_t));
+ memset(t_pda, 0, sizeof(*t_pda));
if (!pda_p)
asm_p->physInfo = pda_p = t_pda;
else {
@@ -200,7 +200,7 @@ rf_MapAccess(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddress,
RF_ASSERT(pdaList);
t_pda = pdaList;
pdaList = pdaList->next;
- memset((char *) t_pda, 0, sizeof(RF_PhysDiskAddr_t));
+ memset(t_pda, 0, sizeof(*t_pda));
pda_p = asm_p->parityInfo = t_pda;
pda_p->type = RF_PDA_TYPE_PARITY;
(layoutPtr->map->MapParity) (raidPtr, rf_RaidAddressOfPrevStripeUnitBoundary(layoutPtr, startAddrWithinStripe),
@@ -217,12 +217,12 @@ rf_MapAccess(RF_Raid_t *raidPtr, RF_RaidAddr_t raidAddress,
RF_ASSERT(pdaList && pdaList->next);
t_pda = pdaList;
pdaList = pdaList->next;
- memset((char *) t_pda, 0, sizeof(RF_PhysDiskAddr_t));
+ memset(t_pda, 0, sizeof(*t_pda));
pda_p = asm_p->parityInfo = t_pda;
pda_p->type = RF_PDA_TYPE_PARITY;
t_pda = pdaList;
pdaList = pdaList->next;
- memset((char *) t_pda, 0, sizeof(RF_PhysDiskAddr_t));
+ memset(t_pda, 0, sizeof(*t_pda));
pda_q = asm_p->qInfo = t_pda;
pda_q->type = RF_PDA_TYPE_Q;
(layoutPtr->map->MapParity) (raidPtr, rf_RaidAddressOfPrevStripeUnitBoundary(layoutPtr, startAddrWithinStripe),
@@ -278,8 +278,8 @@ rf_MarkFailuresInASMList(RF_Raid_t *raidPtr,
asmap->numParityFailed = 0;
asmap->numQFailed = 0;
asmap->numFailedPDAs = 0;
- memset((char *) asmap->failedPDAs, 0,
- RF_MAX_FAILED_PDA * sizeof(RF_PhysDiskAddr_t *));
+ memset(asmap->failedPDAs, 0,
+ RF_MAX_FAILED_PDA * sizeof(*asmap->failedPDAs));
for (pda = asmap->physInfo; pda; pda = pda->next) {
if (RF_DEAD_DISK(disks[pda->col].status)) {
asmap->numDataFailed++;
@@ -379,7 +379,7 @@ rf_AllocAccessStripeMapHeader(void)
RF_AccessStripeMapHeader_t *p;
p = pool_get(&rf_pools.asm_hdr, PR_WAITOK);
- memset((char *) p, 0, sizeof(RF_AccessStripeMapHeader_t));
+ memset(p, 0, sizeof(*p));
return (p);
}
@@ -397,7 +397,7 @@ rf_AllocVFPListElem(void)
RF_VoidFunctionPointerListElem_t *p;
p = pool_get(&rf_pools.vfple, PR_WAITOK);
- memset((char *) p, 0, sizeof(RF_VoidFunctionPointerListElem_t));
+ memset(p, 0, sizeof(*p));
return (p);
}
@@ -416,7 +416,7 @@ rf_AllocVPListElem(void)
RF_VoidPointerListElem_t *p;
p = pool_get(&rf_pools.vple, PR_WAITOK);
- memset((char *) p, 0, sizeof(RF_VoidPointerListElem_t));
+ memset(p, 0, sizeof(*p));
return (p);
}
@@ -434,7 +434,7 @@ rf_AllocASMHeaderListElem(void)
RF_ASMHeaderListElem_t *p;
p = pool_get(&rf_pools.asmhle, PR_WAITOK);
- memset((char *) p, 0, sizeof(RF_ASMHeaderListElem_t));
+ memset(p, 0, sizeof(*p));
return (p);
}
@@ -452,7 +452,7 @@ rf_AllocFailedStripeStruct(void)
RF_FailedStripe_t *p;
p = pool_get(&rf_pools.fss, PR_WAITOK);
- memset((char *) p, 0, sizeof(RF_FailedStripe_t));
+ memset(p, 0, sizeof(*p));
return (p);
}
@@ -473,7 +473,7 @@ rf_AllocPhysDiskAddr(void)
RF_PhysDiskAddr_t *p;
p = pool_get(&rf_pools.pda, PR_WAITOK);
- memset((char *) p, 0, sizeof(RF_PhysDiskAddr_t));
+ memset(p, 0, sizeof(*p));
return (p);
}