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

pid_ns: Pass namespace init task to do_create_pid_ns_helper()

Browse source 
This will be used in next patch.

Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
This commit is contained in:
Kirill Tkhai 2017-05-16 19:26:30 +03:00 • committed by Andrei Vagin
parent f88ed85618
commit 3ba6ed7fcd
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
criu/namespaces.c
View file

@ -2628,6 +2628,7 @@ static int pid_ns_helper(struct ns_id *ns, int sk)
static int do_create_pid_ns_helper(void *arg, int sk, pid_t unused_pid)
{
int pid_ns_fd, mnt_ns_fd, fd, i, lock_fd, transport_fd;
struct pstree_item *ns_reaper;
struct ns_id *ns, *tmp;
struct pid *pid;
pid_t child;
@ -2637,7 +2638,8 @@ static int do_create_pid_ns_helper(void *arg, int sk, pid_t unused_pid)
pr_perror("Can't open pid ns");
goto err;
}
ns = *(struct ns_id **)arg;
ns_reaper = *(struct pstree_item **)arg;
ns = lookup_ns_by_id(ns_reaper->ids->pid_ns_id, &pid_ns_desc);
fd = fdstore_get(ns->pid.nsfd_id);
if (fd < 0) {
@ -2753,7 +2755,7 @@ int create_pid_ns_helper(struct ns_id *ns)
if (sk < 0)
return -1;
if (userns_call(do_create_pid_ns_helper, 0, &ns, sizeof(ns), sk) < 0) {
if (userns_call(do_create_pid_ns_helper, 0, &current, sizeof(current), sk) < 0) {
pr_err("Can't create pid_ns helper\n");
close(sk);
return -1;