diff options
| author | Joe Perches <joe@perches.com> | 2011-05-28 10:36:35 -0700 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 13:59:25 +0200 |
| commit | 3dbd4439837f2cfd2ff302897353f4b1b6263b2a (patch) | |
| tree | e67bc84d5d4708fb8bc60a92709d89d3d811e46b | |
| parent | 8c1fec1ba83b7ce20b65a492a6e73e8d524aed88 (diff) | |
| download | linux-3dbd4439837f2cfd2ff302897353f4b1b6263b2a.tar.gz linux-3dbd4439837f2cfd2ff302897353f4b1b6263b2a.tar.bz2 linux-3dbd4439837f2cfd2ff302897353f4b1b6263b2a.zip | |
net: Convert vmalloc/memset to vzalloc
Signed-off-by: Joe Perches <joe@perches.com>
Acked-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
| -rw-r--r-- | net/netfilter/x_tables.c | 5 | ||||
| -rw-r--r-- | net/rds/ib_cm.c | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index b0869fe3633b..71441b934ffd 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) size = sizeof(void **) * nr_cpu_ids; if (size > PAGE_SIZE) - i->jumpstack = vmalloc(size); + i->jumpstack = vzalloc(size); else - i->jumpstack = kmalloc(size, GFP_KERNEL); + i->jumpstack = kzalloc(size, GFP_KERNEL); if (i->jumpstack == NULL) return -ENOMEM; - memset(i->jumpstack, 0, size); i->stacksize *= xt_jumpstack_multiplier; size = sizeof(void *) * i->stacksize; diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index cd67026be2d5..51c868923f64 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -375,23 +375,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn) goto out; } - ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), + ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), ibdev_to_node(dev)); if (!ic->i_sends) { ret = -ENOMEM; rdsdebug("send allocation failed\n"); goto out; } - memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work)); - ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), + ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), ibdev_to_node(dev)); if (!ic->i_recvs) { ret = -ENOMEM; rdsdebug("recv allocation failed\n"); goto out; } - memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work)); rds_ib_recv_init_ack(ic); |