Commit 30d97d35 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[NETNS]: Consolidate hashes creation in netdev_init()

The dev_name_hash and the dev_index_hash are now booth kmalloc-ed
(and each element is properly initialized as usually) so I think
it's worth consolidating this code making it look nicer (and
saving 28 bytes of .text section ;) )
Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad7379d4
...@@ -4268,32 +4268,39 @@ int netdev_compute_features(unsigned long all, unsigned long one) ...@@ -4268,32 +4268,39 @@ int netdev_compute_features(unsigned long all, unsigned long one)
} }
EXPORT_SYMBOL(netdev_compute_features); EXPORT_SYMBOL(netdev_compute_features);
static struct hlist_head *netdev_create_hash(void)
{
int i;
struct hlist_head *hash;
hash = kmalloc(sizeof(*hash) * NETDEV_HASHENTRIES, GFP_KERNEL);
if (hash != NULL)
for (i = 0; i < NETDEV_HASHENTRIES; i++)
INIT_HLIST_HEAD(&hash[i]);
return hash;
}
/* Initialize per network namespace state */ /* Initialize per network namespace state */
static int netdev_init(struct net *net) static int netdev_init(struct net *net)
{ {
int i;
INIT_LIST_HEAD(&net->dev_base_head); INIT_LIST_HEAD(&net->dev_base_head);
rwlock_init(&dev_base_lock); rwlock_init(&dev_base_lock);
net->dev_name_head = kmalloc( net->dev_name_head = netdev_create_hash();
sizeof(*net->dev_name_head)*NETDEV_HASHENTRIES, GFP_KERNEL); if (net->dev_name_head == NULL)
if (!net->dev_name_head) goto err_name;
return -ENOMEM;
net->dev_index_head = kmalloc(
sizeof(*net->dev_index_head)*NETDEV_HASHENTRIES, GFP_KERNEL);
if (!net->dev_index_head) {
kfree(net->dev_name_head);
return -ENOMEM;
}
for (i = 0; i < NETDEV_HASHENTRIES; i++) net->dev_index_head = netdev_create_hash();
INIT_HLIST_HEAD(&net->dev_name_head[i]); if (net->dev_index_head == NULL)
goto err_idx;
for (i = 0; i < NETDEV_HASHENTRIES; i++)
INIT_HLIST_HEAD(&net->dev_index_head[i]);
return 0; return 0;
err_idx:
kfree(net->dev_name_head);
err_name:
return -ENOMEM;
} }
static void netdev_exit(struct net *net) static void netdev_exit(struct net *net)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment