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>

diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c
index b0869fe3633b713cbf6327e48b653ae5473c715c..71441b934ffd5c4a3381a10c80de251554852f2e 100644 (file)
--- 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 cd67026be2d55a709e0965b81d11a5df004303d1..51c868923f64d6a0e92fd741d73cd258fcc78089 100644 (file)
--- 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);