From 43a42cc11331b438c496bd6ef4ff171c8aed585f Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 7 Dec 2019 18:17:48 +0100 Subject: [PATCH] cgroups/cgfsng: rework cgfsng_{monitor,payload}_delegate_controllers() Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 374bbcf5ae..b73da7dcc5 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -2838,10 +2838,10 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup) base_path = must_append_path(base_path, parts[i], NULL); target = must_make_path(base_path, "cgroup.subtree_control", NULL); ret = lxc_writeat(-1, target, add_controllers, full_len); - if (ret < 0) { - SYSERROR("Could not enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target); - goto on_error; - } + if (ret < 0) + log_error_errno(goto on_error, + errno, "Could not enable \"%s\" controllers in the unified cgroup \"%s\"", + add_controllers, target); TRACE("Enable \"%s\" controllers in the unified cgroup \"%s\"", add_controllers, target); } @@ -2854,11 +2854,17 @@ bool __cgfsng_delegate_controllers(struct cgroup_ops *ops, const char *cgroup) __cgfsng_ops bool cgfsng_monitor_delegate_controllers(struct cgroup_ops *ops) { + if (!ops) + return ret_set_errno(false, ENOENT); + return __cgfsng_delegate_controllers(ops, ops->monitor_cgroup); } __cgfsng_ops bool cgfsng_payload_delegate_controllers(struct cgroup_ops *ops) { + if (!ops) + return ret_set_errno(false, ENOENT); + return __cgfsng_delegate_controllers(ops, ops->container_cgroup); }