From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 18 Nov 2010 01:36:51 +0000 (+0100)
Subject: cgroup: if we couldn't remove a cgroup after killing evertyhing in it then it's fine
X-Git-Tag: v13~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2db9ecac35f9f18b9cd76e5026c31c5eb015ac8c;p=systemd

cgroup: if we couldn't remove a cgroup after killing evertyhing in it then it's fine
---

diff --git a/src/cgroup-util.c b/src/cgroup-util.c
index 2167cdd6..ccc94f86 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;
                 }