Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

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

diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index e478e35..6f71db8 100644 (file)
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -15,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;
@@ -23,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)
@@ -62,9 +51,9 @@ 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_entry_reverse(ops, &pernet_list, list) {
@@ -101,7 +90,6 @@ static int setup_net(struct net *net)
        struct pernet_operations *ops;
        int error;
 
-       memset(net, 0, sizeof(struct net));
        atomic_set(&net->count, 1);
        atomic_set(&net->use_count, 0);
 
@@ -151,9 +139,9 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
        if (err)
                goto out_unlock;
 
-       net_lock();
+       rtnl_lock();
        list_add_tail(&new_net->list, &net_namespace_list);
-       net_unlock();
+       rtnl_unlock();
 
 
 out_unlock:
@@ -178,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)