From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sun, 21 Feb 2021 10:11:37 +0000 (+0100)
Subject: cgroups: s/mountpoint/at_mnt/g
X-Git-Tag: lxc-5.0.0~274^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a58be2ad8bd90fac6aa3f9c0ea9ddda2156d99a5;p=thirdparty%2Flxc.git

cgroups: s/mountpoint/at_mnt/g

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index feb559a6b..c7ad6f389 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -407,7 +407,7 @@ static int cgroup_hierarchy_add(struct cgroup_ops *ops, int dfd_mnt, char *mnt,
 
 	new->fs_type		= fs_type;
 	new->controllers	= controllers;
-	new->mountpoint		= mnt;
+	new->at_mnt		= mnt;
 	new->at_base		= base_cgroup;
 
 	new->dfd_mnt		= dfd_mnt;
@@ -1775,9 +1775,9 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 		__do_free char *hierarchy_mnt = NULL, *path2 = NULL;
 		struct hierarchy *h = ops->hierarchies[i];
 
-		ret = mkdirat(dfd_mnt_tmpfs, h->mountpoint, 0000);
+		ret = mkdirat(dfd_mnt_tmpfs, h->at_mnt, 0000);
 		if (ret < 0)
-			return syserrno(false, "Failed to create cgroup mountpoint %d(%s)", dfd_mnt_tmpfs, h->mountpoint);
+			return syserrno(false, "Failed to create cgroup at_mnt %d(%s)", dfd_mnt_tmpfs, h->at_mnt);
 
 		if (in_cgroup_ns && wants_force_mount) {
 			/*
@@ -1786,7 +1786,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 			 * need to mount the cgroups manually.
 			 */
 			ret = cgroupfs_mount(cgroup_automount_type, h, rootfs,
-					     dfd_mnt_tmpfs, h->mountpoint);
+					     dfd_mnt_tmpfs, h->at_mnt);
 			if (ret < 0)
 				return false;
 
@@ -1795,7 +1795,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 
 		/* Here is where the ancient kernel section begins. */
 		ret = cgroupfs_bind_mount(cgroup_automount_type, h, rootfs,
-					  dfd_mnt_tmpfs, h->mountpoint);
+					  dfd_mnt_tmpfs, h->at_mnt);
 		if (ret < 0)
 			return false;
 
@@ -1805,7 +1805,7 @@ __cgfsng_ops static bool cgfsng_mount(struct cgroup_ops *ops,
 		if (!cgroup_root)
 			cgroup_root = must_make_path(rootfs_mnt, DEFAULT_CGROUP_MOUNTPOINT, NULL);
 
-		hierarchy_mnt = must_make_path(cgroup_root, h->mountpoint, NULL);
+		hierarchy_mnt = must_make_path(cgroup_root, h->at_mnt, NULL);
 		path2 = must_make_path(hierarchy_mnt, h->at_base,
 				       ops->container_cgroup, NULL);
 		ret = mkdir_p(path2, 0755);
@@ -2045,8 +2045,8 @@ static const char *cgfsng_get_cgroup_do(struct cgroup_ops *ops,
 	if (!path)
 		return NULL;
 
-	len = strlen(h->mountpoint);
-	if (!strnequal(h->mountpoint, DEFAULT_CGROUP_MOUNTPOINT,
+	len = strlen(h->at_mnt);
+	if (!strnequal(h->at_mnt, DEFAULT_CGROUP_MOUNTPOINT,
 		       STRLITERALLEN(DEFAULT_CGROUP_MOUNTPOINT))) {
 		path += STRLITERALLEN(DEFAULT_CGROUP_MOUNTPOINT);
 		path += strspn(path, "/");
diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c
index 9965d6b49..957f7667f 100644
--- a/src/lxc/cgroups/cgroup.c
+++ b/src/lxc/cgroups/cgroup.c
@@ -85,7 +85,7 @@ void cgroup_exit(struct cgroup_ops *ops)
 			free(*p);
 		free((*it)->cgroup2_chown);
 
-		free((*it)->mountpoint);
+		free((*it)->at_mnt);
 		free((*it)->at_base);
 
 		free_equal((*it)->container_full_path,
diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h
index fdc10e526..ace48edb7 100644
--- a/src/lxc/cgroups/cgroup.h
+++ b/src/lxc/cgroups/cgroup.h
@@ -46,8 +46,8 @@ typedef enum {
  * - unified hierarchy
  *   Either NULL, or a null-terminated list of all enabled controllers.
  *
- * @mountpoint
- * - The mountpoint we will use.
+ * @at_mnt
+ * - The at_mnt we will use.
  * - legacy hierarchy
  *   It will be either /sys/fs/cgroup/controller or
  *   /sys/fs/cgroup/controllerlist.
@@ -83,7 +83,6 @@ struct hierarchy {
 	 */
 	char **cgroup2_chown;
 	char **controllers;
-	char *mountpoint;
 	char *container_full_path;
 	char *container_limit_path;
 	cgroupfs_type_magic_t fs_type;
@@ -105,8 +104,9 @@ struct hierarchy {
 	/* File descriptor for the monitor's cgroup. */
 	int cgfd_mon;
 
-	/* File descriptor for the controller's mountpoint @mountpoint. */
+	/* File descriptor for the controller's mountpoint @at_mnt. */
 	int dfd_mnt;
+	char *at_mnt;
 
 	/* File descriptor for the controller's base cgroup path @at_base. */
 	int dfd_base;
@@ -236,11 +236,11 @@ static inline int cgroup_unified_fd(const struct cgroup_ops *ops)
 	return ops->unified->cgfd_con;
 }
 
-#define make_cgroup_path(__hierarchy, __first, ...)                        \
-	({                                                                 \
-		const struct hierarchy *__h = __hierarchy;                 \
-		must_make_path(DEFAULT_CGROUP_MOUNTPOINT, __h->mountpoint, \
-			       __first, __VA_ARGS__);                      \
+#define make_cgroup_path(__hierarchy, __first, ...)                    \
+	({                                                             \
+		const struct hierarchy *__h = __hierarchy;             \
+		must_make_path(DEFAULT_CGROUP_MOUNTPOINT, __h->at_mnt, \
+			       __first, __VA_ARGS__);                  \
 	})
 
 #endif /* __LXC_CGROUP_H */