Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[powerpc.git] / net / core / net_namespace.c

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index f259a9b..6f71db8 100644 (file)
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -4,6 +4,7 @@
 #include <linux/slab.h>
 #include <linux/list.h>
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include <net/net_namespace.h>
 
 /*
@@ -14,7 +15,6 @@ static LIST_HEAD(pernet_list);
 static struct list_head *first_device = &pernet_list;
 static DEFINE_MUTEX(net_mutex);
 
-static DEFINE_MUTEX(net_list_mutex);
 LIST_HEAD(net_namespace_list);
 
 static struct kmem_cache *net_cachep;
@@ -22,19 +22,9 @@ static struct kmem_cache *net_cachep;
 struct net init_net;
 EXPORT_SYMBOL_GPL(init_net);
 
-void net_lock(void)
-{
-       mutex_lock(&net_list_mutex);
-}
-
-void net_unlock(void)
-{
-       mutex_unlock(&net_list_mutex);
-}
-
 static struct net *net_alloc(void)
 {
-       return kmem_cache_alloc(net_cachep, GFP_KERNEL);
+       return kmem_cache_zalloc(net_cachep, GFP_KERNEL);
 }
 
 static void net_free(struct net *net)
@@ -54,7 +44,6 @@ static void net_free(struct net *net)
 static void cleanup_net(struct work_struct *work)
 {
        struct pernet_operations *ops;
-       struct list_head *ptr;
        struct net *net;
 
        net = container_of(work, struct net, work);
@@ -62,13 +51,12 @@ static void cleanup_net(struct work_struct *work)
        mutex_lock(&net_mutex);
 
        /* Don't let anyone else find us. */
-       net_lock();
+       rtnl_lock();
        list_del(&net->list);
-       net_unlock();
+       rtnl_unlock();
 
        /* Run all of the network namespace exit methods */
-       list_for_each_prev(ptr, &pernet_list) {
-               ops = list_entry(ptr, struct pernet_operations, list);
+       list_for_each_entry_reverse(ops, &pernet_list, list) {
                if (ops->exit)
                        ops->exit(net);
        }
@@ -100,16 +88,13 @@ static int setup_net(struct net *net)
 {
        /* Must be called with net_mutex held */
        struct pernet_operations *ops;
-       struct list_head *ptr;
        int error;
 
-       memset(net, 0, sizeof(struct net));
        atomic_set(&net->count, 1);
        atomic_set(&net->use_count, 0);
 
        error = 0;
-       list_for_each(ptr, &pernet_list) {
-               ops = list_entry(ptr, struct pernet_operations, list);
+       list_for_each_entry(ops, &pernet_list, list) {
                if (ops->init) {
                        error = ops->init(net);
                        if (error < 0)
@@ -118,18 +103,58 @@ static int setup_net(struct net *net)
        }
 out:
        return error;
+
 out_undo:
        /* Walk through the list backwards calling the exit functions
         * for the pernet modules whose init functions did not fail.
         */
-       for (ptr = ptr->prev; ptr != &pernet_list; ptr = ptr->prev) {
-               ops = list_entry(ptr, struct pernet_operations, list);
+       list_for_each_entry_continue_reverse(ops, &pernet_list, list) {
                if (ops->exit)
                        ops->exit(net);
        }
        goto out;
 }
 
+struct net *copy_net_ns(unsigned long flags, struct net *old_net)
+{
+       struct net *new_net = NULL;
+       int err;
+
+       get_net(old_net);
+
+       if (!(flags & CLONE_NEWNET))
+               return old_net;
+
+#ifndef CONFIG_NET_NS
+       return ERR_PTR(-EINVAL);
+#endif
+
+       err = -ENOMEM;
+       new_net = net_alloc();
+       if (!new_net)
+               goto out;
+
+       mutex_lock(&net_mutex);
+       err = setup_net(new_net);
+       if (err)
+               goto out_unlock;
+
+       rtnl_lock();
+       list_add_tail(&new_net->list, &net_namespace_list);
+       rtnl_unlock();
+
+
+out_unlock:
+       mutex_unlock(&net_mutex);
+out:
+       put_net(old_net);
+       if (err) {
+               net_free(new_net);
+               new_net = ERR_PTR(err);
+       }
+       return new_net;
+}
+
 static int __init net_ns_init(void)
 {
        int err;
@@ -141,9 +166,9 @@ static int __init net_ns_init(void)
        mutex_lock(&net_mutex);
        err = setup_net(&init_net);
 
-       net_lock();
+       rtnl_lock();
        list_add_tail(&init_net.list, &net_namespace_list);
-       net_unlock();
+       rtnl_unlock();
 
        mutex_unlock(&net_mutex);
        if (err)