From 2db9ecac35f9f18b9cd76e5026c31c5eb015ac8c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 18 Nov 2010 02:36:51 +0100 Subject: [PATCH] cgroup: if we couldn't remove a cgroup after killing evertyhing in it then it's fine --- src/cgroup-util.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/cgroup-util.c b/src/cgroup-util.c index 2167cdd6d..ccc94f86a 100644 --- a/src/cgroup-util.c +++ b/src/cgroup-util.c @@ -298,7 +298,9 @@ int cg_kill_recursive(const char *controller, const char *path, int sig, bool ig if (rem) if ((r = cg_rmdir(controller, path)) < 0) { - if (ret >= 0 && r != -ENOENT) + if (ret >= 0 && + r != -ENOENT && + r != -EBUSY) ret = r; } @@ -459,7 +461,9 @@ int cg_migrate_recursive(const char *controller, const char *from, const char *t if (rem) if ((r = cg_rmdir(controller, from)) < 0) { - if (ret >= 0 && r != -ENOENT) + if (ret >= 0 && + r != -ENOENT && + r != -EBUSY) ret = r; } -- 2.30.2