From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Sat, 17 Feb 2018 18:48:59 +0000 (+0100)
Subject: cgfsng: __cg_legacy_setup_limits()
X-Git-Tag: lxc-3.0.0~50^2~31
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c347df58468462f17aae3591b974d73204b87898;p=mirror_lxc.git

cgfsng: __cg_legacy_setup_limits()

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index a9eed90a9..f62debea4 100644
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -2730,9 +2730,9 @@ static bool __cg_legacy_setup_limits(void *hdata,
 				     struct lxc_list *cgroup_settings,
 				     bool do_devices)
 {
-	struct cgfsng_handler_data *d = hdata;
-	struct lxc_list *iterator, *sorted_cgroup_settings, *next;
+	struct lxc_list *iterator, *next, *sorted_cgroup_settings;
 	struct lxc_cgroup *cg;
+	struct cgfsng_handler_data *d = hdata;
 	bool ret = false;
 
 	if (lxc_list_empty(cgroup_settings))
@@ -2748,15 +2748,16 @@ static bool __cg_legacy_setup_limits(void *hdata,
 		if (do_devices == !strncmp("devices", cg->subsystem, 7)) {
 			if (cg_legacy_set_data(cg->subsystem, cg->value, d)) {
 				if (do_devices && (errno == EACCES || errno == EPERM)) {
-					WARN("Error setting %s to %s for %s",
-					      cg->subsystem, cg->value, d->name);
+					WARN("Failed to set \"%s\" to \"%s\"",
+					     cg->subsystem, cg->value);
 					continue;
 				}
-				SYSERROR("Error setting %s to %s for %s",
-				      cg->subsystem, cg->value, d->name);
+				WARN("Failed to set \"%s\" to \"%s\"",
+				     cg->subsystem, cg->value);
 				goto out;
 			}
-			DEBUG("cgroup '%s' set to '%s'", cg->subsystem, cg->value);
+			DEBUG("Set controller \"%s\" set to \"%s\"",
+			      cg->subsystem, cg->value);
 		}
 	}