]> git.proxmox.com Git - mirror_lxc.git/commitdiff
cgroups: tweak lxc.cgroup.use handling in __cgroup_init()
authorChristian Brauner <christian.brauner@ubuntu.com>
Fri, 19 Feb 2021 23:42:51 +0000 (00:42 +0100)
committerChristian Brauner <christian.brauner@ubuntu.com>
Fri, 19 Feb 2021 23:43:43 +0000 (00:43 +0100)
Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
src/lxc/cgroups/cgfsng.c

index 49ae6dee1f48ed2466af18fa1a8cdbe5bdb9f893..d41a8ed88b978320242164283f348fbd4c8b3098 100644 (file)
@@ -3493,7 +3493,7 @@ static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf)
 {
        __do_close int dfd = -EBADF;
        int ret;
-       const char *tmp;
+       const char *controllers_use;
 
        if (ops->dfd_mnt_cgroupfs_host >= 0)
                return ret_errno(EINVAL);
@@ -3508,18 +3508,17 @@ static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf)
        if (dfd < 0)
                return syserrno(-errno, "Failed to open " DEFAULT_CGROUP_MOUNTPOINT);
 
-       tmp = lxc_global_config_value("lxc.cgroup.use");
-       if (tmp) {
-               __do_free char *pin = NULL;
-               char *chop, *cur;
+       controllers_use = lxc_global_config_value("lxc.cgroup.use");
+       if (controllers_use) {
+               __do_free char *dup = NULL;
+               char *it;
 
-               pin = strdup(tmp);
-               if (!pin)
+               dup = strdup(controllers_use);
+               if (!dup)
                        return -errno;
-               chop = pin;
 
-               lxc_iterate_parts(cur, chop, ",")
-                       must_append_string(&ops->cgroup_use, cur);
+               lxc_iterate_parts(it, dup, ",")
+                       must_append_string(&ops->cgroup_use, it);
        }
 
        /*