1 files changed, 22 insertions, 32 deletions

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index e3bebd36f053..b7292a2719dc 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -115,41 +115,34 @@ static void net_free(struct net *net)
         kmem_cache_free(net_cachep, net);
 }
 
-struct net *copy_net_ns(unsigned long flags, struct net *old_net)
+static struct net *net_create(void)
 {
-        struct net *new_net = NULL;
-        int err;
-
-        get_net(old_net);
-
-        if (!(flags & CLONE_NEWNET))
-                return old_net;
-
-        err = -ENOMEM;
-        new_net = net_alloc();
-        if (!new_net)
-                goto out_err;
+        struct net *net;
+        int rv;
 
+        net = net_alloc();
+        if (!net)
+                return ERR_PTR(-ENOMEM);
         mutex_lock(&net_mutex);
-        err = setup_net(new_net);
-        if (!err) {
+        rv = setup_net(net);
+        if (rv == 0) {
                 rtnl_lock();
-                list_add_tail(&new_net->list, &net_namespace_list);
+                list_add_tail(&net->list, &net_namespace_list);
                 rtnl_unlock();
         }
         mutex_unlock(&net_mutex);
+        if (rv < 0) {
+                net_free(net);
+                return ERR_PTR(rv);
+        }
+        return net;
+}
 
-        if (err)
-                goto out_free;
-out:
-        put_net(old_net);
-        return new_net;
-
-out_free:
-        net_free(new_net);
-out_err:
-        new_net = ERR_PTR(err);
-        goto out;
+struct net *copy_net_ns(unsigned long flags, struct net *old_net)
+{
+        if (!(flags & CLONE_NEWNET))
+                return get_net(old_net);
+        return net_create();
 }
 
 static void cleanup_net(struct work_struct *work)
@@ -203,9 +196,7 @@ 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;
 
-        printk(KERN_INFO "net_namespace: %zd bytes\n", sizeof(struct net));
 #ifdef CONFIG_NET_NS
         net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
                                         SMP_CACHE_BYTES,
@@ -224,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;
 }