cgfs: ignore mount prefix in mountinfo if cgroup namespaces are supported

This is not 100% correct, but will suffice until we fix the kernel so that we can distinguish between bind mounts and namespaced cgroupfs mounts. Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

cgfs: ignore mount prefix in mountinfo if cgroup namespaces are supported
fcca16bc · Serge Hallyn · 5d55659d · fcca16bc
Commit fcca16bc authored Feb 26, 2016 by Serge Hallyn
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cgfs.c src/lxc/cgfs.c +2 -1

No files found.
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -418,6 +418,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char **
 	size_t mount_point_capacity = 0;
 	size_t token_capacity = 0;
 	int r;
+	bool is_cgns = cgns_supported();

 	proc_self_mountinfo = fopen_cloexec("/proc/self/mountinfo", "r");
 	/* if for some reason (because of setns() and pid namespace for example),
@@ -512,7 +513,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char **
 		meta_data->mount_points[mount_point_count++] = mount_point;

 		mount_point->hierarchy = h;
-		if (is_lxcfs)
+		if (is_lxcfs || is_cgns)
 			mount_point->mount_prefix = strdup("/");
 		else
 			mount_point->mount_prefix = strdup(tokens[3]);