lkml.org 
[lkml]   [2007]   [Nov]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectRe: [PATCH 3/4] fib_hash: kmalloc + memset conversion to kzalloc
    Date
    fib_hash: kmalloc + memset conversion to kzalloc
    fix to avoid memset entirely.

    Thanks.
    Joonwoo

    Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>

    ---
    diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
    index 527a6e0..9d0cee2 100644
    --- a/net/ipv4/fib_hash.c
    +++ b/net/ipv4/fib_hash.c
    @@ -102,10 +102,10 @@ static struct hlist_head *fz_hash_alloc(int divisor)
    unsigned long size = divisor * sizeof(struct hlist_head);

    if (size <= PAGE_SIZE) {
    - return kmalloc(size, GFP_KERNEL);
    + return kzalloc(size, GFP_KERNEL);
    } else {
    return (struct hlist_head *)
    - __get_free_pages(GFP_KERNEL, get_order(size));
    + __get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(size));
    }
    }

    @@ -174,8 +174,6 @@ static void fn_rehash_zone(struct fn_zone *fz)
    ht = fz_hash_alloc(new_divisor);

    if (ht) {
    - memset(ht, 0, new_divisor * sizeof(struct hlist_head));
    -
    write_lock_bh(&fib_hash_lock);
    old_ht = fz->fz_hash;
    fz->fz_hash = ht;
    @@ -219,7 +217,6 @@ fn_new_zone(struct fn_hash *table, int z)
    kfree(fz);
    return NULL;
    }
    - memset(fz->fz_hash, 0, fz->fz_divisor * sizeof(struct hlist_head *));
    fz->fz_order = z;
    fz->fz_mask = inet_make_mask(z);

    ---
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-26 11:27    [W:0.020 / U:119.176 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site