lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

netns: simplify net_ns_init

Browse Source 
The net_ns_init code can be simplified. No need to save error code
if it is only going to panic if it is set 4 lines later.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Acked-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Stephen Hemminger
2009-05-21 15:10:31 -07:00
committed by David S. Miller
parent 1f7a2bb4ef
commit ca0f31125c
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/core/net_namespace.c
View File

@@ -196,7 +196,6 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
static int __init net_ns_init(void) static int __init net_ns_init(void)
{ {
struct net_generic *ng; struct net_generic *ng;
int err;
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
net_cachep = kmem_cache_create("net_namespace", sizeof(struct net), net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
@@ -216,15 +215,14 @@ static int __init net_ns_init(void)
rcu_assign_pointer(init_net.gen, ng); rcu_assign_pointer(init_net.gen, ng);
mutex_lock(&net_mutex); mutex_lock(&net_mutex);
err = setup_net(&init_net); if (setup_net(&init_net))
panic("Could not setup the initial network namespace");
rtnl_lock(); rtnl_lock();
list_add_tail(&init_net.list, &net_namespace_list); list_add_tail(&init_net.list, &net_namespace_list);
rtnl_unlock(); rtnl_unlock();
mutex_unlock(&net_mutex); mutex_unlock(&net_mutex);
if (err)
panic("Could not setup the initial network namespace");
return 0; return 0;
} }