summaryrefslogtreecommitdiff
path: root/sys/dev/raidframe
diff options
context:
space:
mode:
authorchristos <christos@NetBSD.org>2019-02-10 17:13:33 +0000
committerchristos <christos@NetBSD.org>2019-02-10 17:13:33 +0000
commitc9026edaa7b785b67f4c37a4b7114a37a904ebde (patch)
tree2e45294b757f2107dbaa20cbb2b2b5af30a17aa3 /sys/dev/raidframe
parente995f016c5cff6a75387243c9f1d1314aff94c1e (diff)
Introduce PR_ZERO to avoid open-coding memset()s everywhere. OK riastradh@.
Diffstat (limited to 'sys/dev/raidframe')
-rw-r--r--sys/dev/raidframe/rf_alloclist.c10
-rw-r--r--sys/dev/raidframe/rf_callback.c9
-rw-r--r--sys/dev/raidframe/rf_dagutils.c36
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c7
-rw-r--r--sys/dev/raidframe/rf_map.c46
-rw-r--r--sys/dev/raidframe/rf_psstatus.c10
6 files changed, 27 insertions, 91 deletions
diff --git a/sys/dev/raidframe/rf_alloclist.c b/sys/dev/raidframe/rf_alloclist.c
index 1eb7d9c15cc..42e6ee43d64 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.27 2019/02/09 03:33:59 christos Exp $ */
+/* $NetBSD: rf_alloclist.c,v 1.28 2019/02/10 17:13:33 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.27 2019/02/09 03:33:59 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_alloclist.c,v 1.28 2019/02/10 17:13:33 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -122,9 +122,5 @@ rf_FreeAllocList(RF_AllocListElem_t *l)
RF_AllocListElem_t *
rf_real_MakeAllocList(void)
{
- RF_AllocListElem_t *p;
-
- p = pool_get(&rf_pools.alloclist, PR_WAITOK);
- memset(p, 0, sizeof(*p));
- return (p);
+ return pool_get(&rf_pools.alloclist, PR_WAITOK | PR_ZERO);
}
diff --git a/sys/dev/raidframe/rf_callback.c b/sys/dev/raidframe/rf_callback.c
index 33ba7f6157f..054ff0c321c 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.22 2009/03/15 17:17:23 cegger Exp $ */
+/* $NetBSD: rf_callback.c,v 1.23 2019/02/10 17:13:33 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.22 2009/03/15 17:17:23 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_callback.c,v 1.23 2019/02/10 17:13:33 christos Exp $");
#include <dev/raidframe/raidframevar.h>
#include <sys/pool.h>
@@ -71,10 +71,7 @@ rf_ConfigureCallback(RF_ShutdownList_t **listp)
RF_CallbackDesc_t *
rf_AllocCallbackDesc(void)
{
- RF_CallbackDesc_t *p;
-
- p = pool_get(&rf_pools.callback, PR_WAITOK);
- return (p);
+ return pool_get(&rf_pools.callback, PR_WAITOK);
}
void
diff --git a/sys/dev/raidframe/rf_dagutils.c b/sys/dev/raidframe/rf_dagutils.c
index 4d037a4cdcc..2556bb08cce 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.55 2019/02/09 03:34:00 christos Exp $ */
+/* $NetBSD: rf_dagutils.c,v 1.56 2019/02/10 17:13:33 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.55 2019/02/09 03:34:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_dagutils.c,v 1.56 2019/02/10 17:13:33 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -254,11 +254,7 @@ rf_ConfigureDAGs(RF_ShutdownList_t **listp)
RF_DagHeader_t *
rf_AllocDAGHeader(void)
{
- RF_DagHeader_t *dh;
-
- dh = pool_get(&rf_pools.dagh, PR_WAITOK);
- memset(dh, 0, sizeof(*dh));
- return (dh);
+ return pool_get(&rf_pools.dagh, PR_WAITOK | PR_ZERO);
}
void
@@ -270,11 +266,7 @@ rf_FreeDAGHeader(RF_DagHeader_t * dh)
RF_DagNode_t *
rf_AllocDAGNode(void)
{
- RF_DagNode_t *node;
-
- node = pool_get(&rf_pools.dagnode, PR_WAITOK);
- memset(node, 0, sizeof(*node));
- return (node);
+ return pool_get(&rf_pools.dagnode, PR_WAITOK | PR_ZERO);
}
void
@@ -292,12 +284,7 @@ rf_FreeDAGNode(RF_DagNode_t *node)
RF_DagList_t *
rf_AllocDAGList(void)
{
- RF_DagList_t *dagList;
-
- dagList = pool_get(&rf_pools.daglist, PR_WAITOK);
- memset(dagList, 0, sizeof(*dagList));
-
- return (dagList);
+ return pool_get(&rf_pools.daglist, PR_WAITOK | PR_ZERO);
}
void
@@ -309,11 +296,7 @@ rf_FreeDAGList(RF_DagList_t *dagList)
void *
rf_AllocDAGPCache(void)
{
- void *p;
- p = pool_get(&rf_pools.dagpcache, PR_WAITOK);
- memset(p, 0, RF_DAGPCACHE_SIZE);
-
- return (p);
+ return pool_get(&rf_pools.dagpcache, PR_WAITOK | PR_ZERO);
}
void
@@ -325,12 +308,7 @@ rf_FreeDAGPCache(void *p)
RF_FuncList_t *
rf_AllocFuncList(void)
{
- RF_FuncList_t *funcList;
-
- funcList = pool_get(&rf_pools.funclist, PR_WAITOK);
- memset(funcList, 0, sizeof(*funcList));
-
- return (funcList);
+ return pool_get(&rf_pools.funclist, PR_WAITOK | PR_ZERO);
}
void
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index f4e39cb8054..14e5f2b4297 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.54 2019/02/09 03:34:00 christos Exp $ */
+/* $NetBSD: rf_diskqueue.c,v 1.55 2019/02/10 17:13:33 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.54 2019/02/09 03:34:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_diskqueue.c,v 1.55 2019/02/10 17:13:33 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -367,11 +367,10 @@ rf_CreateDiskQueueData(RF_IoType_t typ, RF_SectorNum_t ssect,
{
RF_DiskQueueData_t *p;
- p = pool_get(&rf_pools.dqd, waitflag);
+ p = pool_get(&rf_pools.dqd, waitflag | PR_ZERO);
if (p == NULL)
return (NULL);
- memset(p, 0, sizeof(*p));
if (waitflag == PR_WAITOK) {
p->bp = getiobuf(NULL, true);
} else {
diff --git a/sys/dev/raidframe/rf_map.c b/sys/dev/raidframe/rf_map.c
index 79932701a84..4ad740aa4f6 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.48 2019/02/09 03:34:00 christos Exp $ */
+/* $NetBSD: rf_map.c,v 1.49 2019/02/10 17:13:33 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.48 2019/02/09 03:34:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_map.c,v 1.49 2019/02/10 17:13:33 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -376,12 +376,7 @@ rf_ConfigureMapModule(RF_ShutdownList_t **listp)
RF_AccessStripeMapHeader_t *
rf_AllocAccessStripeMapHeader(void)
{
- RF_AccessStripeMapHeader_t *p;
-
- p = pool_get(&rf_pools.asm_hdr, PR_WAITOK);
- memset(p, 0, sizeof(*p));
-
- return (p);
+ return pool_get(&rf_pools.asm_hdr, PR_WAITOK | PR_ZERO);
}
void
@@ -394,12 +389,7 @@ rf_FreeAccessStripeMapHeader(RF_AccessStripeMapHeader_t *p)
RF_VoidFunctionPointerListElem_t *
rf_AllocVFPListElem(void)
{
- RF_VoidFunctionPointerListElem_t *p;
-
- p = pool_get(&rf_pools.vfple, PR_WAITOK);
- memset(p, 0, sizeof(*p));
-
- return (p);
+ return pool_get(&rf_pools.vfple, PR_WAITOK | PR_ZERO);
}
void
@@ -413,12 +403,7 @@ rf_FreeVFPListElem(RF_VoidFunctionPointerListElem_t *p)
RF_VoidPointerListElem_t *
rf_AllocVPListElem(void)
{
- RF_VoidPointerListElem_t *p;
-
- p = pool_get(&rf_pools.vple, PR_WAITOK);
- memset(p, 0, sizeof(*p));
-
- return (p);
+ return pool_get(&rf_pools.vple, PR_WAITOK | PR_ZERO);
}
void
@@ -431,12 +416,7 @@ rf_FreeVPListElem(RF_VoidPointerListElem_t *p)
RF_ASMHeaderListElem_t *
rf_AllocASMHeaderListElem(void)
{
- RF_ASMHeaderListElem_t *p;
-
- p = pool_get(&rf_pools.asmhle, PR_WAITOK);
- memset(p, 0, sizeof(*p));
-
- return (p);
+ return pool_get(&rf_pools.asmhle, PR_WAITOK | PR_ZERO);
}
void
@@ -449,12 +429,7 @@ rf_FreeASMHeaderListElem(RF_ASMHeaderListElem_t *p)
RF_FailedStripe_t *
rf_AllocFailedStripeStruct(void)
{
- RF_FailedStripe_t *p;
-
- p = pool_get(&rf_pools.fss, PR_WAITOK);
- memset(p, 0, sizeof(*p));
-
- return (p);
+ return pool_get(&rf_pools.fss, PR_WAITOK | PR_ZERO);
}
void
@@ -470,12 +445,7 @@ rf_FreeFailedStripeStruct(RF_FailedStripe_t *p)
RF_PhysDiskAddr_t *
rf_AllocPhysDiskAddr(void)
{
- RF_PhysDiskAddr_t *p;
-
- p = pool_get(&rf_pools.pda, PR_WAITOK);
- memset(p, 0, sizeof(*p));
-
- return (p);
+ return pool_get(&rf_pools.pda, PR_WAITOK | PR_ZERO);
}
/* allocates a list of PDAs, locking the free list only once when we
* have to call calloc, we do it one component at a time to simplify
diff --git a/sys/dev/raidframe/rf_psstatus.c b/sys/dev/raidframe/rf_psstatus.c
index 61e1e925a00..990515477d0 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.35 2019/02/09 03:34:00 christos Exp $ */
+/* $NetBSD: rf_psstatus.c,v 1.36 2019/02/10 17:13:33 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.35 2019/02/09 03:34:00 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_psstatus.c,v 1.36 2019/02/10 17:13:33 christos Exp $");
#include <dev/raidframe/raidframevar.h>
@@ -267,11 +267,7 @@ rf_RemoveFromActiveReconTable(RF_Raid_t *raidPtr, RF_StripeNum_t psid,
RF_ReconParityStripeStatus_t *
rf_AllocPSStatus(RF_Raid_t *raidPtr)
{
- RF_ReconParityStripeStatus_t *p;
-
- p = pool_get(&rf_pools.pss, PR_WAITOK);
- memset(p, 0, sizeof(*p));
- return (p);
+ return pool_get(&rf_pools.pss, PR_WAITOK | PR_ZERO);
}
void