Mirrors/criu
1
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu.git synced 2026-07-21 09:10:10 +00:00
Code Issues Projects Releases Wiki Activity

ns: Simplify create_net_ns()

Browse source 
Merge code with the same functionality in one

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2017-02-24 14:31:33 +03:00 • committed by Andrei Vagin
parent b54c7d3d88
commit a75f0fa8bc
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
criu/net.c
View file

@ -1953,6 +1953,19 @@ static int open_net_ns(struct ns_id *nsid)
return 0;
}
static int do_create_net_ns(struct ns_id *ns)
{
if (unshare(CLONE_NEWNET)) {
pr_perror("Unable to create a new netns");
return -1;
}
if (prepare_net_ns(ns->id))
return -1;
if (open_net_ns(ns))
return -1;
return 0;
}
int prepare_net_namespaces()
{
struct ns_id *nsid;
@ -1964,15 +1977,7 @@ int prepare_net_namespaces()
if (nsid->nd != &net_ns_desc)
continue;
if (unshare(CLONE_NEWNET)) {
pr_perror("Unable to create a new netns");
goto err;
}
if (prepare_net_ns(nsid->id))
goto err;
if (open_net_ns(nsid))
if (do_create_net_ns(nsid))
goto err;
}