From 457a70aed8c85963de03ab96effa68ba1c414500 Mon Sep 17 00:00:00 2001
From: Johann Felix Soden <johfel@users.sourceforge.net>
Date: Wed, 7 Nov 2007 01:30:30 -0800
Subject: [PATCH] --- yaml --- r: 73276 b: refs/heads/master c:
 45a19b0a725a04f3255d9d3da1fca30bb97f1481 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/net/core/net_namespace.c | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 000f6833e554..f21883a72ff2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0127539ea9b5fcfe1a1d7d4d57f12384da5190c
+refs/heads/master: 45a19b0a725a04f3255d9d3da1fca30bb97f1481
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
index e9f0964ce70b..3f6d37deac45 100644
--- a/trunk/net/core/net_namespace.c
+++ b/trunk/net/core/net_namespace.c
@@ -64,6 +64,20 @@ static struct net *net_alloc(void)
 	return kmem_cache_zalloc(net_cachep, GFP_KERNEL);
 }
 
+static void net_free(struct net *net)
+{
+	if (!net)
+		return;
+
+	if (unlikely(atomic_read(&net->use_count) != 0)) {
+		printk(KERN_EMERG "network namespace not free! Usage: %d\n",
+			atomic_read(&net->use_count));
+		return;
+	}
+
+	kmem_cache_free(net_cachep, net);
+}
+
 struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 {
 	struct net *new_net = NULL;
@@ -100,20 +114,6 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 	return new_net;
 }
 
-static void net_free(struct net *net)
-{
-	if (!net)
-		return;
-
-	if (unlikely(atomic_read(&net->use_count) != 0)) {
-		printk(KERN_EMERG "network namespace not free! Usage: %d\n",
-			atomic_read(&net->use_count));
-		return;
-	}
-
-	kmem_cache_free(net_cachep, net);
-}
-
 static void cleanup_net(struct work_struct *work)
 {
 	struct pernet_operations *ops;