NETLINK : kzalloc() conversion
Subsystems (2)
PATCH 1/1 NETLINK : kzalloc() conversion
nl_pid_hash_alloc() is renamed to nl_pid_hash_zalloc(). It is now returning zeroed memory to its callers.
net/netlink/af_netlink.c +6 -7
@@ -237,13 +237,14 @@ found:return sk; } -static inline struct hlist_head *nl_pid_hash_alloc (size_t size) +static inline struct hlist_head *nl_pid_hash_zalloc (size_t size) {if (size <=PAGE_SIZE ) -return kmalloc (size,GFP_ATOMIC ); +return kzalloc (size,GFP_ATOMIC );else return (struct hlist_head *) -__get_free_pages (GFP_ATOMIC ,get_order (size)); +__get_free_pages (GFP_ATOMIC | __GFP_ZERO, +get_order (size)); }static inline void nl_pid_hash_free (struct hlist_head *table,size_t size)
@@ -272,11 +273,10 @@ static int nl_pid_hash_rehash(struct nl_pid_hash *hash, int grow) size *=2 ; } - table =nl_pid_hash_alloc (size); + table =nl_pid_hash_zalloc (size);if (!table)return 0 ; -memset (table,0 , size); otable = hash->table; hash->table = table; hash->mask = mask;
@@ -1919,7 +1919,7 @@ static int __init netlink_proto_init(void)for (i =0 ; i <MAX_LINKS ; i++) {struct nl_pid_hash *hash = &nl_table[i].hash; - hash->table =nl_pid_hash_alloc (1 *sizeof (*hash->table)); + hash->table =nl_pid_hash_zalloc (1 *sizeof (*hash->table));if (!hash->table) {while (i-- >0 ) nl_pid_hash_free(nl_table[i].hash.table,
@@ -1927,7 +1927,6 @@ static int __init netlink_proto_init(void)kfree (nl_table); goto panic; } -memset (hash->table,0 ,1 *sizeof (*hash->table)); hash->max_shift = order; hash->shift =0 ; hash->mask =0 ;
In article <[email protected]> (at Tue, 11 Dec 2007 06:40:18 +0100), Eric Dumazet <[email protected]> says:
Quoted 2 lines
nl_pid_hash_alloc()is renamed tonl_pid_hash_zalloc(). It is now returning zeroed memory to its callers.
I do think you do not need (and you should not) rename it because XXX_zalloc() would imply we have raw XXX_alloc().
--yoshfuji
Quoted 8 lines · YOSHIFUJI Hideaki / 吉藤英明
In article <[email protected]> (at Tue, 11 Dec 2007 06:40:18 +0100), Eric Dumazet <[email protected]> says:
Quoted 2 lines
nl_pid_hash_alloc()is renamed tonl_pid_hash_zalloc(). It is now returning zeroed memory to its callers.I do think you do not need (and you should not) rename it because
XXX_zalloc()would imply we have rawXXX_alloc().
Well, its a static function, so a single grep should satisfy reader's concern :)