From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Sun, 19 Jan 2014 15:17:23 +0000 (-0600)
Subject: cgmanager: &existed for remove+create now returns -1 on failure
X-Git-Tag: lxc-1.0.0.beta3~87
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecc357ca0834b7e72381bbe1bfba06c2893c614b;p=thirdparty%2Flxc.git

cgmanager: &existed for remove+create now returns -1 on failure

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/src/lxc/cgmanager.c b/src/lxc/cgmanager.c
index a5d5e5569..97bda2c17 100644
--- a/src/lxc/cgmanager.c
+++ b/src/lxc/cgmanager.c
@@ -137,7 +137,7 @@ void cgmanager_remove_cgroup(const char *controller, const char *path)
 	if ( cgmanager_remove_sync(NULL, cgroup_manager, controller,
 				   path, CG_REMOVE_RECURSIVE, &existed) != 0)
 		ERROR("Error removing %s:%s", controller, path);
-	if (!existed)
+	if (existed == -1)
 		INFO("cgroup removal attempt: %s:%s did not exist", controller, path);
 }
 
@@ -210,7 +210,7 @@ again:
 			cleanup_cgroups(d, tmp);
 			return false;
 		}
-		if (existed)
+		if (existed == 1)
 			goto next;
 	}
 	// success