Skip to content

Commit

Permalink
netns: simplify net_ns_init
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Stephen Hemminger authored and David S. Miller committed May 21, 2009
1 parent 1f7a2bb commit ca0f311
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions net/core/net_namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
static int __init net_ns_init(void)
{
struct net_generic *ng;
int err;

#ifdef CONFIG_NET_NS
net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
Expand All @@ -216,15 +215,14 @@ static int __init net_ns_init(void)
rcu_assign_pointer(init_net.gen, ng);

mutex_lock(&net_mutex);
err = setup_net(&init_net);
if (setup_net(&init_net))
panic("Could not setup the initial network namespace");

rtnl_lock();
list_add_tail(&init_net.list, &net_namespace_list);
rtnl_unlock();

mutex_unlock(&net_mutex);
if (err)
panic("Could not setup the initial network namespace");

return 0;
}
Expand Down

0 comments on commit ca0f311

Please sign in to comment.