فهرست منبع

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>
Joe Perches 14 سال پیش
والد
کامیت
3dbd443983
2فایلهای تغییر یافته به همراه4 افزوده شده و 7 حذف شده
  1. 2 3
      net/netfilter/x_tables.c
  2. 2 4
      net/rds/ib_cm.c

+ 2 - 3
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;
 	size = sizeof(void **) * nr_cpu_ids;
 	if (size > PAGE_SIZE)
 	if (size > PAGE_SIZE)
-		i->jumpstack = vmalloc(size);
+		i->jumpstack = vzalloc(size);
 	else
 	else
-		i->jumpstack = kmalloc(size, GFP_KERNEL);
+		i->jumpstack = kzalloc(size, GFP_KERNEL);
 	if (i->jumpstack == NULL)
 	if (i->jumpstack == NULL)
 		return -ENOMEM;
 		return -ENOMEM;
-	memset(i->jumpstack, 0, size);
 
 
 	i->stacksize *= xt_jumpstack_multiplier;
 	i->stacksize *= xt_jumpstack_multiplier;
 	size = sizeof(void *) * i->stacksize;
 	size = sizeof(void *) * i->stacksize;

+ 2 - 4
net/rds/ib_cm.c

@@ -375,23 +375,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn)
 		goto out;
 		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));
 				   ibdev_to_node(dev));
 	if (!ic->i_sends) {
 	if (!ic->i_sends) {
 		ret = -ENOMEM;
 		ret = -ENOMEM;
 		rdsdebug("send allocation failed\n");
 		rdsdebug("send allocation failed\n");
 		goto out;
 		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));
 				   ibdev_to_node(dev));
 	if (!ic->i_recvs) {
 	if (!ic->i_recvs) {
 		ret = -ENOMEM;
 		ret = -ENOMEM;
 		rdsdebug("recv allocation failed\n");
 		rdsdebug("recv allocation failed\n");
 		goto out;
 		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);
 	rds_ib_recv_init_ack(ic);