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>
This commit is contained in:
Родитель
8c1fec1ba8
Коммит
3dbd443983
|
@ -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;
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче