chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f8cd17
)
cgroup: if we couldn't remove a cgroup after killing evertyhing in it then it's fine
author
Lennart Poettering
<lennart@poettering.net>
Thu, 18 Nov 2010 01:36:51 +0000
(
02:36
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 18 Nov 2010 01:36:51 +0000
(
02:36
+0100)
src/cgroup-util.c
patch
|
blob
|
history
diff --git
a/src/cgroup-util.c
b/src/cgroup-util.c
index 2167cdd6d052c2a8954747b6572f2d2e0793b095..ccc94f86a1fc3eb4c70da24675fca9f742f23763 100644
(file)
--- 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 (rem)
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
if (rem)
if ((r = cg_rmdir(controller, from)) < 0) {
if (rem)
if ((r = cg_rmdir(controller, from)) < 0) {
- if (ret >= 0 && r != -ENOENT)
+ if (ret >= 0 &&
+ r != -ENOENT &&
+ r != -EBUSY)
ret = r;
}
ret = r;
}