Skip to content

Commit

Permalink
[IPV4] fib_hash: kmalloc + memset conversion to kzalloc
Browse files Browse the repository at this point in the history
fib_hash: kmalloc + memset conversion to kzalloc
fix to avoid memset entirely.

Signed-off-by: Joonwoo Park <joonwpark81@gmail.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Joonwoo Park authored and David S. Miller committed Jan 28, 2008
1 parent 88f8349 commit 3015a34
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions net/ipv4/fib_hash.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
}

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);

Expand Down

0 comments on commit 3015a34

Please sign in to comment.