---

yaml --- r: 150088 b: refs/heads/master c: 4a84822 h: refs/heads/master v: v3
git-mirror · May 4, 2009 · 2edc687 · 2edc687
1 parent 6487475
commit 2edc687
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e8cf5c069c6cb7b316e9b1715eac38873dd5cab
+refs/heads/master: 4a84822c60afa2b0e2d3370041f69f9526a34757
diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c
@@ -120,10 +120,8 @@ 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;
+		return get_net(old_net);
 
 	err = -ENOMEM;
 	new_net = net_alloc();
@@ -142,7 +140,6 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 	if (err)
 		goto out_free;
 out:
-	put_net(old_net);
 	return new_net;
 
 out_free: