From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 7 Dec 2019 17:17:48 +0000 (+0100)
Subject: cgroups/cgfsng: rework cgfsng_{monitor,payload}_delegate_controllers()
X-Git-Tag: lxc-4.0.0~78^2~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=61fbc369f9ff0bf186971693cf420c6b0829ac49;p=thirdparty%2Flxc.git

cgroups/cgfsng: rework cgfsng_{monitor,payload}_delegate_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 abd085a6d..2011eb8a2 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 @@ on_error:
 
 __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);
 }