From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 17 Feb 2018 18:12:51 +0000 (+0100)
Subject: cgfsng: cg_hybrid_get_controllers()
X-Git-Tag: lxc-2.0.10~300
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9888a11262db33ac19f12c49fa77aa6dafbdd5cf;p=thirdparty%2Flxc.git

cgfsng: cg_hybrid_get_controllers()

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 4e60224eb..d3f4593f7 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -845,17 +845,17 @@ static bool all_controllers_found(void)
 	return true;
 }
 
-/*
- * Get the controllers from a mountinfo line
- * There are other ways we could get this info.  For lxcfs, field 3
- * is /cgroup/controller-list.  For cgroupfs, we could parse the mount
- * options.  But we simply assume that the mountpoint must be
- * /sys/fs/cgroup/controller-list
+/* Get the controllers from a mountinfo line There are other ways we could get
+ * this info. For lxcfs, field 3 is /cgroup/controller-list. For cgroupfs, we
+ * could parse the mount options. But we simply assume that the mountpoint must
+ * be /sys/fs/cgroup/controller-list
  */
 static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
 					int type)
 {
-	/* the fourth field is /sys/fs/cgroup/comma-delimited-controller-list */
+	/* The fourth field is /sys/fs/cgroup/comma-delimited-controller-list
+	 * for legacy hierarchies.
+	 */
 	int i;
 	char *dup, *p2, *tok;
 	char *p = line, *saveptr = NULL, *sep = ",";
@@ -868,9 +868,10 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
 		p++;
 	}
 
-	/* note - if we change how mountinfo works, then our caller
-	 * will need to verify /sys/fs/cgroup/ in this field */
-	if (strncmp(p, "/sys/fs/cgroup/", 15)) {
+	/* Note, if we change how mountinfo works, then our caller will need to
+	 * verify /sys/fs/cgroup/ in this field.
+	 */
+	if (strncmp(p, "/sys/fs/cgroup/", 15) != 0) {
 		CGFSNG_DEBUG("Found hierarchy not under /sys/fs/cgroup: \"%s\"\n", p);
 		return NULL;
 	}
@@ -898,6 +899,7 @@ static char **cg_hybrid_get_controllers(char **klist, char **nlist, char *line,
 		free(dup);
 	}
 	*p2 = ' ';
+
 	return aret;
 }