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

criu: rename current_ns_mask to root_ns_mask (v2)

Browse Source 
Now we supports sub-mntns, so root_ns_mask sounds more correct than
current_ns_mask.

v2: typo fix
Signed-off-by: Andrey Vagin <avagin@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Andrey Vagin
2014-04-21 18:23:22 +04:00
committed by Pavel Emelyanov
parent 4067f4bb7e
commit d2012883ab
10 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
namespaces.c
View File

@@ -115,7 +115,7 @@ int restore_ns(int rst, struct ns_desc *nd)
struct ns_id *ns_ids = NULL;
static unsigned int ns_next_id = 1;
unsigned long current_ns_mask = 0;
unsigned long root_ns_mask = 0;
int rst_add_ns_id(unsigned int id, pid_t pid, struct ns_desc *nd)
{
@@ -179,9 +179,9 @@ static unsigned int generate_ns_id(int pid, unsigned int kid, struct ns_desc *nd
if (pid != getpid()) {
if (pid == root_item->pid.real) {
BUG_ON(current_ns_mask & nd->cflag);
BUG_ON(root_ns_mask & nd->cflag);
pr_info("Will take %s namespace in the image\n", nd->str);
current_ns_mask |= nd->cflag;
root_ns_mask |= nd->cflag;
} else if (nd->cflag & ~CLONE_SUBNS) {
pr_err("Can't dump nested %s namespace for %d\n",
nd->str, pid);
@@ -402,14 +402,14 @@ static int gen_ns_ids(int pid)
*/
int gen_predump_ns_mask(void)
{
BUG_ON(current_ns_mask);
BUG_ON(root_ns_mask);
if (gen_ns_ids(getpid()))
return -1;
if (gen_ns_ids(root_item->pid.real))
return -1;
pr_info("NS mask generated: %lx\n", current_ns_mask);
pr_info("NS mask generated: %lx\n", root_ns_mask);
return 0;
}