chiark / gitweb /
cgroup: if we couldn't remove a cgroup after killing evertyhing in it then it's fine
authorLennart Poettering <lennart@poettering.net>
Thu, 18 Nov 2010 01:36:51 +0000 (02:36 +0100)
committerLennart Poettering <lennart@poettering.net>
Thu, 18 Nov 2010 01:36:51 +0000 (02:36 +0100)
src/cgroup-util.c

index 2167cdd..ccc94f8 100644 (file)
@@ -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;
                 }