diff options
| author | Joonwoo Park <joonwpark81@gmail.com> | 2007-11-26 10:29:32 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:06 -0500 |
| commit | 88f8349164cf4035e63db9e6f484e0ce9cb17e47 (patch) | |
| tree | 48f731ce82b84ebd88a86a58be0e1cc69a7dcd90 | |
| parent | dcaee95a1b396f85cdc28099f39710be328d3a5e (diff) | |
[IPV4] fib_semantics: kmalloc + memset conversion to kzalloc
fib_semantics: 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>
| -rw-r--r-- | net/ipv4/fib_semantics.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 33ec96001d90..ec9b0dde9f9c 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c | |||
| @@ -605,10 +605,10 @@ static inline unsigned int fib_laddr_hashfn(__be32 val) | |||
| 605 | static struct hlist_head *fib_hash_alloc(int bytes) | 605 | static struct hlist_head *fib_hash_alloc(int bytes) |
| 606 | { | 606 | { |
| 607 | if (bytes <= PAGE_SIZE) | 607 | if (bytes <= PAGE_SIZE) |
| 608 | return kmalloc(bytes, GFP_KERNEL); | 608 | return kzalloc(bytes, GFP_KERNEL); |
| 609 | else | 609 | else |
| 610 | return (struct hlist_head *) | 610 | return (struct hlist_head *) |
| 611 | __get_free_pages(GFP_KERNEL, get_order(bytes)); | 611 | __get_free_pages(GFP_KERNEL | __GFP_ZERO, get_order(bytes)); |
| 612 | } | 612 | } |
| 613 | 613 | ||
| 614 | static void fib_hash_free(struct hlist_head *hash, int bytes) | 614 | static void fib_hash_free(struct hlist_head *hash, int bytes) |
| @@ -712,12 +712,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg) | |||
| 712 | if (!new_info_hash || !new_laddrhash) { | 712 | if (!new_info_hash || !new_laddrhash) { |
| 713 | fib_hash_free(new_info_hash, bytes); | 713 | fib_hash_free(new_info_hash, bytes); |
| 714 | fib_hash_free(new_laddrhash, bytes); | 714 | fib_hash_free(new_laddrhash, bytes); |
| 715 | } else { | 715 | } else |
| 716 | memset(new_info_hash, 0, bytes); | ||
| 717 | memset(new_laddrhash, 0, bytes); | ||
| 718 | |||
| 719 | fib_hash_move(new_info_hash, new_laddrhash, new_size); | 716 | fib_hash_move(new_info_hash, new_laddrhash, new_size); |
| 720 | } | ||
| 721 | 717 | ||
| 722 | if (!fib_hash_size) | 718 | if (!fib_hash_size) |
| 723 | goto failure; | 719 | goto failure; |
