diff options
author | Lennart Poettering <lennart@poettering.net> | 2010-11-18 02:36:51 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2010-11-18 02:36:51 +0100 |
commit | 2db9ecac35f9f18b9cd76e5026c31c5eb015ac8c (patch) | |
tree | 2715148f522e85a191871e3e3edaae64ec6e7459 /src | |
parent | 2f8cd170aeb0d748f5af3cefb387d14f67fc286e (diff) |
cgroup: if we couldn't remove a cgroup after killing evertyhing in it then it's fine
Diffstat (limited to 'src')
-rw-r--r-- | src/cgroup-util.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/cgroup-util.c b/src/cgroup-util.c index 2167cdd6d0..ccc94f86a1 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; } |