From ce2f449a570c41299163cc83f076352be7287413 Mon Sep 17 00:00:00 2001 From: Kamal Mostafa Date: Thu, 19 May 2016 08:14:06 -0700 Subject: [PATCH] Revert "UBUNTU: SAUCE: cgroup mount: ignore nsroot=" BugLink: http://bugs.launchpad.net/bugs/1584163 This reverts commit f7d70a0c83bfd752ee9483661e8dd2e6091421bf. Cc: Serge Hallyn Signed-off-by: Kamal Mostafa --- kernel/cgroup.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kernel/cgroup.c b/kernel/cgroup.c index df0b3589c334..6885905fa31f 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -1680,10 +1680,6 @@ static int parse_cgroupfs_options(char *data, struct cgroup_sb_opts *opts) opts->none = true; continue; } - if (!strncmp(token, "nsroot=", 7)) { - /* ignore nsroot= copied from mountinfo */ - continue; - } if (!strcmp(token, "all")) { /* Mutually exclusive option 'all' + subsystem name */ if (one_ss) -- 2.39.5