[lxc-devel] [lxc/master] cgfs: ignore mount prefix in mountinfo if cgroup namespaces are suppo…

hallyn on Github lxc-bot at linuxcontainers.org
Fri Feb 26 21:39:00 UTC 2016


A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 514 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160226/63d13826/attachment.bin>
-------------- next part --------------
From fcca16bc86c3e08439bc4a7b865213689b6e1c12 Mon Sep 17 00:00:00 2001
From: Serge Hallyn <serge.hallyn at ubuntu.com>
Date: Fri, 26 Feb 2016 13:35:24 -0800
Subject: [PATCH] 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 at ubuntu.com>
---
 src/lxc/cgfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index 8c1cb64..16c80eb 100644
--- 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]);


More information about the lxc-devel mailing list