From 96ef603bc2cc9473f56634b52ae0460d82870afc Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Sat, 17 Feb 2018 19:48:59 +0100 Subject: [PATCH] cgfsng: __cg_legacy_setup_limits() Signed-off-by: Christian Brauner --- src/lxc/cgroups/cgfsng.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index a892e7fc7..801324094 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -2708,9 +2708,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)) @@ -2726,15 +2726,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); } } -- 2.47.2