From ba3f32cf15d4911fecfd69a01fcbcc1f5c5b9535 Mon Sep 17 00:00:00 2001 From: Serge Hallyn Date: Mon, 10 Mar 2014 11:59:08 -0500 Subject: [PATCH] cgm_destroy: ignore a NULL d->cgroup_path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Depending on where during container creation we failed, cgroup_path may be NULL. Don't try to delete the cgroup in that case. (Also fix a wrong function name in an ERROR message) Signed-off-by: Serge Hallyn Acked-by: Stéphane Graber --- src/lxc/cgmanager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c index c80a136e5..4795da43a 100644 --- a/src/lxc/cgmanager.c +++ b/src/lxc/cgmanager.c @@ -438,7 +438,7 @@ static void cgm_destroy(void *hdata) struct cgm_data *d = hdata; int i; - if (!d) + if (!d || !d->cgroup_path) return; if (!cgm_dbus_connect()) { ERROR("Error connecting to cgroup manager"); @@ -703,7 +703,7 @@ static int cgm_do_set(const char *controller, const char *file, if (ret != 0) { NihError *nerr; nerr = nih_error_get(); - ERROR("call to cgmanager_remove_sync failed: %s", nerr->message); + ERROR("call to cgmanager_set_value_sync failed: %s", nerr->message); nih_free(nerr); ERROR("Error setting cgroup %s limit %s", file, cgroup); }