Commit f639680b authored by Pavel Emelyanov's avatar Pavel Emelyanov

userns: Don't fork task not to dump userns

Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
parent 1283921d
...@@ -722,10 +722,6 @@ static int do_dump_namespaces(struct ns_id *ns) ...@@ -722,10 +722,6 @@ static int do_dump_namespaces(struct ns_id *ns)
ns->id, ns->pid); ns->id, ns->pid);
ret = dump_net_ns(ns->id); ret = dump_net_ns(ns->id);
break; break;
case CLONE_NEWUSER:
/* userns is dumped before dumping tasks */
ret = 0;
break;
default: default:
pr_err("Unknown namespace flag %x", ns->nd->cflag); pr_err("Unknown namespace flag %x", ns->nd->cflag);
break; break;
...@@ -770,6 +766,8 @@ int dump_namespaces(struct pstree_item *item, unsigned int ns_flags) ...@@ -770,6 +766,8 @@ int dump_namespaces(struct pstree_item *item, unsigned int ns_flags)
case CLONE_NEWPID: case CLONE_NEWPID:
/* Dumped explicitly with dump_mnt_namespaces() */ /* Dumped explicitly with dump_mnt_namespaces() */
case CLONE_NEWNS: case CLONE_NEWNS:
/* Userns is dumped before dumping tasks */
case CLONE_NEWUSER:
continue; continue;
} }
......
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