Skip to content

Commit

Permalink
netns 1/2: don't get/put old netns on CLONE_NEWNET
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alexey Dobriyan authored and David S. Miller committed May 4, 2009
1 parent 6e8cf5c commit 4a84822
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions net/core/net_namespace.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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:
Expand Down

0 comments on commit 4a84822

Please sign in to comment.