From d6c06927dff74122f8bd2cc357b828fcc81f8650 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Fri, 19 Feb 2021 11:12:22 +0100 Subject: [PATCH] conf: improve lxc_clear_cgroups() Signed-off-by: Christian Brauner --- src/lxc/conf.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lxc/conf.c b/src/lxc/conf.c index 43e8668c1..899d28543 100644 --- a/src/lxc/conf.c +++ b/src/lxc/conf.c @@ -3674,17 +3674,17 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version) bool all = false; if (version == CGROUP2_SUPER_MAGIC) { - global_token = "lxc.cgroup2"; - namespaced_token = "lxc.cgroup2."; - namespaced_token_len = STRLITERALLEN("lxc.cgroup2."); + global_token = "lxc.cgroup2"; + namespaced_token = "lxc.cgroup2."; + namespaced_token_len = STRLITERALLEN("lxc.cgroup2."); list = &c->cgroup2; } else if (version == CGROUP_SUPER_MAGIC) { - global_token = "lxc.cgroup"; - namespaced_token = "lxc.cgroup."; - namespaced_token_len = STRLITERALLEN("lxc.cgroup."); + global_token = "lxc.cgroup"; + namespaced_token = "lxc.cgroup."; + namespaced_token_len = STRLITERALLEN("lxc.cgroup."); list = &c->cgroup; } else { - return -EINVAL; + return ret_errno(EINVAL); } if (strequal(key, global_token)) @@ -3692,7 +3692,7 @@ int lxc_clear_cgroups(struct lxc_conf *c, const char *key, int version) else if (strnequal(key, namespaced_token, namespaced_token_len)) k += namespaced_token_len; else - return -EINVAL; + return ret_errno(EINVAL); lxc_list_for_each_safe (it, list, next) { struct lxc_cgroup *cg = it->elem; -- 2.47.3