From: Christian Brauner Date: Fri, 19 Feb 2021 23:38:57 +0000 (+0100) Subject: cgroups: avoid additional variable for single access X-Git-Tag: lxc-5.0.0~274^2~30 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d83967fa39bb2dc72eeb395989e59aa3ae81842;p=thirdparty%2Flxc.git cgroups: avoid additional variable for single access Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 4a44e3eba..495785083 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -3492,7 +3492,6 @@ static int cg_unified_init(struct cgroup_ops *ops, bool relative, static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf) { __do_close int dfd = -EBADF; - bool relative = conf->cgroup_meta.relative; int ret; const char *tmp; @@ -3529,9 +3528,11 @@ static int __cgroup_init(struct cgroup_ops *ops, struct lxc_conf *conf) ops->dfd_mnt_cgroupfs_host = dfd; if (unified_cgroup_fd(dfd)) - ret = cg_unified_init(ops, relative, !lxc_list_empty(&conf->id_map)); + ret = cg_unified_init(ops, conf->cgroup_meta.relative, + !lxc_list_empty(&conf->id_map)); else - ret = cg_hybrid_init(ops, relative, !lxc_list_empty(&conf->id_map)); + ret = cg_hybrid_init(ops, conf->cgroup_meta.relative, + !lxc_list_empty(&conf->id_map)); if (ret < 0) return syserrno(ret, "Failed to initialize cgroups");