From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 13 Apr 2020 12:39:18 +0000 (+0200)
Subject: cgroups: adhere to boolean return
X-Git-Tag: lxc-5.0.0~454^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec4d463d0ff5b1a4c0838de0aaa5cd51d5797c8d;p=thirdparty%2Flxc.git

cgroups: adhere to boolean return

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 522eb412d..a6ee6875e 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1194,11 +1194,9 @@ static bool cgroup_tree_create(struct cgroup_ops *ops, struct lxc_conf *conf,
 		 * line, which is not possible once a subdirectory has been
 		 * created.
 		 */
-		if (string_in_list(h->controllers, "devices")) {
-			ret = ops->setup_limits_legacy(ops, conf, true);
-			if (ret < 0)
-				return ret;
-		}
+		if (string_in_list(h->controllers, "devices") &&
+		    !ops->setup_limits_legacy(ops, conf, true))
+			return log_error(false, "Failed to setup legacy device limits");
 	}
 
 	ret = mkdir_eexist_on_last(path, 0755);