From: Christian Brauner Date: Wed, 1 Nov 2017 10:13:18 +0000 (+0100) Subject: cgroups/cgfsng: remove is_lxcfs() X-Git-Tag: lxc-2.0.10~590 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8353971fd36eea36f326b4727a457656224b323d;p=thirdparty%2Flxc.git cgroups/cgfsng: remove is_lxcfs() We don't need to parse fuse.lxcfs entries. Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 9427a9a5f..1d0f7b39e 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -733,15 +733,6 @@ static bool all_controllers_found(void) return true; } -/* Return true if the fs type is fuse.lxcfs */ -static bool is_lxcfs(const char *line) -{ - char *p = strstr(line, " - "); - if (!p) - return false; - return strncmp(p, " - fuse.lxcfs ", 14) == 0; -} - /* * Get the controllers from a mountinfo line * There are other ways we could get this info. For lxcfs, field 3 @@ -1082,7 +1073,7 @@ static bool parse_hierarchies(void) bool is_cgroup_v2, writeable; is_cgroup_v2 = is_cgroupfs_v2(line); - if (!is_lxcfs(line) && !is_cgroupfs_v1(line) && !is_cgroup_v2) + if (!is_cgroupfs_v1(line) && !is_cgroup_v2) continue; controller_list = get_controllers(klist, nlist, line);