aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2009-05-04 11:11:38 -0700
committerDavid S. Miller <davem@davemloft.net>2009-05-04 11:11:38 -0700
commit4a84822c60afa2b0e2d3370041f69f9526a34757 (patch)
treee94f81b61c05d1358fdf95674a30fe8a9ef8dc3e
parent6e8cf5c069c6cb7b316e9b1715eac38873dd5cab (diff)
netns 1/2: don't get/put old netns on CLONE_NEWNET
copy_net_ns() doesn't copy anything, it creates fresh netns, so get/put of old netns isn't needed. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Acked-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/core/net_namespace.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index e3bebd36f05..4488010d5a5 100644
--- a/net/core/net_namespace.c
+++ b/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: