From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 21 Feb 2021 00:25:49 +0000 (+0100)
Subject: cgroups: remove unused helpers
X-Git-Tag: lxc-5.0.0~274^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e821c3b74a2f5463d76d07cda42e07a9be804808;p=thirdparty%2Flxc.git

cgroups: remove unused helpers

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cgroups/cgroup_utils.c b/src/lxc/cgroups/cgroup_utils.c
index 6beb57067..78bd9ecb0 100644
--- a/src/lxc/cgroups/cgroup_utils.c
+++ b/src/lxc/cgroups/cgroup_utils.c
@@ -20,72 +20,6 @@
 
 lxc_log_define(cgroup_utils, lxc);
 
-int get_cgroup_version(char *line)
-{
-	if (is_cgroupfs_v1(line))
-		return CGROUP_SUPER_MAGIC;
-
-	if (is_cgroupfs_v2(line))
-		return CGROUP2_SUPER_MAGIC;
-
-	return 0;
-}
-
-bool is_cgroupfs_v1(char *line)
-{
-	char *p = strstr(line, " - ");
-	if (!p)
-		return false;
-	return strnequal(p, " - cgroup ", 10);
-}
-
-bool is_cgroupfs_v2(char *line)
-{
-	char *p = strstr(line, " - ");
-	if (!p)
-		return false;
-
-	return strnequal(p, " - cgroup2 ", 11);
-}
-
-bool test_writeable_v1(char *mountpoint, char *path)
-{
-	__do_free char *fullpath = must_make_path(mountpoint, path, NULL);
-	return (access(fullpath, W_OK) == 0);
-}
-
-bool test_writeable_v2(char *mountpoint, char *path)
-{
-	/* In order to move ourselves into an appropriate sub-cgroup we need to
-	 * have write access to the parent cgroup's "cgroup.procs" file, i.e. we
-	 * need to have write access to the our current cgroups's "cgroup.procs"
-	 * file.
-	 */
-	int ret;
-	__do_free char *cgroup_path = NULL, *cgroup_procs_file = NULL,
-		       *cgroup_threads_file = NULL;
-
-	cgroup_path = must_make_path(mountpoint, path, NULL);
-	cgroup_procs_file = must_make_path(cgroup_path, "cgroup.procs", NULL);
-
-	ret = access(cgroup_path, W_OK);
-	if (ret < 0)
-		return false;
-
-	ret = access(cgroup_procs_file, W_OK);
-	if (ret < 0)
-		return false;
-
-	/* Newer versions of cgroup2 now also require write access to the
-	 * "cgroup.threads" file.
-	 */
-	cgroup_threads_file = must_make_path(cgroup_path, "cgroup.threads", NULL);
-	if (!file_exists(cgroup_threads_file))
-		return true;
-
-	return (access(cgroup_threads_file, W_OK) == 0);
-}
-
 bool unified_cgroup_fd(int fd)
 {
 
diff --git a/src/lxc/cgroups/cgroup_utils.h b/src/lxc/cgroups/cgroup_utils.h
index 41a8a2199..b18621d30 100644
--- a/src/lxc/cgroups/cgroup_utils.h
+++ b/src/lxc/cgroups/cgroup_utils.h
@@ -9,26 +9,6 @@
 #include "compiler.h"
 #include "file_utils.h"
 
-/* Retrieve the cgroup version of a given entry from /proc/<pid>/mountinfo. */
-__hidden extern int get_cgroup_version(char *line);
-
-/* Check if given entry from /proc/<pid>/mountinfo is a cgroupfs v1 mount. */
-__hidden extern bool is_cgroupfs_v1(char *line);
-
-/* Check if given entry from /proc/<pid>/mountinfo is a cgroupfs v2 mount. */
-__hidden extern bool is_cgroupfs_v2(char *line);
-
-/* Given a v1 hierarchy @mountpoint and base @path, verify that we can create
- * directories underneath it.
- */
-__hidden extern bool test_writeable_v1(char *mountpoint, char *path);
-
-/* Given a v2 hierarchy @mountpoint and base @path, verify that we can create
- * directories underneath it and that we have write access to the cgroup's
- * "cgroup.procs" file.
- */
-__hidden extern bool test_writeable_v2(char *mountpoint, char *path);
-
 __hidden extern bool unified_cgroup_fd(int fd);
 
 static inline bool cgns_supported(void)