[PATCH 1/3] Revert "UBUNTU: SAUCE: cgroup mount: ignore nsroot="

Serge Hallyn serge.hallyn at ubuntu.com
Tue May 10 20:44:05 UTC 2016


This reverts commit f7d70a0c83bfd752ee9483661e8dd2e6091421bf.
---
 kernel/cgroup.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index d344dc5..8a4408f 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.7.0





More information about the kernel-team mailing list