mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-09-02 07:15:31 +00:00
Code Issues Releases Wiki Activity

rst: Evaluate per-task clone mask early

Browse Source 
When we've read all pstree-items and their ids we
can get the desired clone-flags early and avoid all
these dances with flag calculations in fork_with_pid
and company.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Pavel Emelyanov
2013-01-19 01:16:19 +04:00
parent 10b338c5db
commit 475bb1e775
6 changed files with 65 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
namespaces.c
View File

@@ -260,56 +260,6 @@ int dump_namespaces(struct pid *ns_pid, unsigned int ns_flags)
return 0;
}
static unsigned long get_clone_mask(TaskKobjIdsEntry *i,
TaskKobjIdsEntry *p)
{
unsigned long mask = 0;
if (i->pid_ns_id != p->pid_ns_id)
mask |= CLONE_NEWPID;
if (i->net_ns_id != p->net_ns_id)
mask |= CLONE_NEWNET;
if (i->ipc_ns_id != p->ipc_ns_id)
mask |= CLONE_NEWIPC;
if (i->uts_ns_id != p->uts_ns_id)
mask |= CLONE_NEWUTS;
if (i->mnt_ns_id != p->mnt_ns_id)
mask |= CLONE_NEWNS;
return mask;
}
int check_ns_ids(struct pstree_item *item)
{
struct pstree_item *p = item->parent;
if (!p) {
if (!root_ids) {
current_ns_mask = opts.rst_namespaces_flags;
return 0;
}
current_ns_mask = get_clone_mask(item->ids, root_ids);
pr_info("Will restore in %lx namespaces\n", current_ns_mask);
return 0;
}
if (!item->ids)
return 0;
while (!p->ids) {
p = p->parent;
BUG_ON(!p); /* must meet the root_item */
}
if (get_clone_mask(item->ids, p->ids)) {
pr_err("Task in sub namespace\n");
return -1;
}
return 0;
}
int prepare_namespace(int pid, unsigned long clone_flags)
{
pr_info("Restoring namespaces %d flags 0x%lx\n",