[PATCH 2/4] fib_semantics: kmalloc + memset conversion to kzalloc

[Joonwoo Park]

fib_semantics: kmalloc + memset conversion to kzalloc

Signed-off-by: Joonwoo Park <[EMAIL PROTECTED]>

Thanks.
Joonwoo

---
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index 1351a26..87a1e72 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -605,10 +605,15 @@ static inline unsigned int fib_laddr_hashfn(__be32 val)
 static struct hlist_head *fib_hash_alloc(int bytes)
 {
        if (bytes <= PAGE_SIZE)
-               return kmalloc(bytes, GFP_KERNEL);
-       else
-               return (struct hlist_head *)
+               return kzalloc(bytes, GFP_KERNEL);
+       else {
+               struct hlist_head *hash;
+               hash = (struct hlist_head *)
                        __get_free_pages(GFP_KERNEL, get_order(bytes));
+               if (hash)
+                       memset(hash, 0, bytes);
+               return hash;
+       }
 }
 
 static void fib_hash_free(struct hlist_head *hash, int bytes)
@@ -712,12 +717,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
                if (!new_info_hash || !new_laddrhash) {
                        fib_hash_free(new_info_hash, bytes);
                        fib_hash_free(new_laddrhash, bytes);
-               } else {
-                       memset(new_info_hash, 0, bytes);
-                       memset(new_laddrhash, 0, bytes);
-
+               } else
                        fib_hash_move(new_info_hash, new_laddrhash, new_size);
-               }
 
                if (!fib_hash_size)
                        goto failure;
---

-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html