Commit 2db9ecac authored by Lennart Poettering's avatar Lennart Poettering
Browse files

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

parent 2f8cd170
...@@ -298,7 +298,9 @@ int cg_kill_recursive(const char *controller, const char *path, int sig, bool ig ...@@ -298,7 +298,9 @@ int cg_kill_recursive(const char *controller, const char *path, int sig, bool ig
if (rem) if (rem)
if ((r = cg_rmdir(controller, path)) < 0) { if ((r = cg_rmdir(controller, path)) < 0) {
if (ret >= 0 && r != -ENOENT) if (ret >= 0 &&
r != -ENOENT &&
r != -EBUSY)
ret = r; ret = r;
} }
...@@ -459,7 +461,9 @@ int cg_migrate_recursive(const char *controller, const char *from, const char *t ...@@ -459,7 +461,9 @@ int cg_migrate_recursive(const char *controller, const char *from, const char *t
if (rem) if (rem)
if ((r = cg_rmdir(controller, from)) < 0) { if ((r = cg_rmdir(controller, from)) < 0) {
if (ret >= 0 && r != -ENOENT) if (ret >= 0 &&
r != -ENOENT &&
r != -EBUSY)
ret = r; ret = r;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment