lkml.org 
[lkml]   [2011]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[TRIVIAL PATCH next 15/15] net: Convert vmalloc/memset to vzalloc
    Date
    Signed-off-by: Joe Perches <joe@perches.com>
    ---
    net/netfilter/x_tables.c | 5 ++---
    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 b0869fe..71441b9 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 fd453dd..6ecaf78 100644
    --- a/net/rds/ib_cm.c
    +++ b/net/rds/ib_cm.c
    @@ -374,23 +374,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);

    --
    1.7.5.rc3.dirty


    \
     
     \ /
      Last update: 2011-05-28 19:41    [W:0.022 / U:124.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site