Commit e4dd8d2b authored by Pavel Emelyanov's avatar Pavel Emelyanov

cgroup: Don't collect criu's stray cgset

In commit 736a2940 there was added a collection of non-root task's
cgsets. But criu's cgset should anyway be excluded from it.
Signed-off-by: 's avatarPavel Emelyanov <xemul@virtuozzo.com>
parent ed9d85c3
......@@ -690,10 +690,13 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
BUG_ON(criu_cgset);
criu_cgset = cs;
pr_info("Set %d is criu one\n", cs->id);
} else if (item == root_item) {
BUG_ON(root_cgset);
root_cgset = cs;
pr_info("Set %d is root one\n", cs->id);
} else {
if (item == root_item) {
BUG_ON(root_cgset);
root_cgset = cs;
pr_info("Set %d is root one\n", cs->id);
} else
pr_info("Set %d is a stray\n", cs->id);
/*
* The on-stack ctls is moved into cs inside
......@@ -701,10 +704,6 @@ int dump_task_cgroup(struct pstree_item *item, u32 *cg_id, struct parasite_dump_
*/
if (cs != criu_cgset && collect_cgroups(&cs->ctls))
return -1;
} else {
pr_info("Set %d is a stray\n", cs->id);
if (collect_cgroups(&cs->ctls))
return -1;
}
*cg_id = cs->id;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment