chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cgroup: drop inherit flag, this mus be fixed in the kernel
[elogind.git]
/
src
/
cgroup.c
diff --git
a/src/cgroup.c
b/src/cgroup.c
index 56529eb6b23b5938a38e648e83a76dda4491f7d6..330014dc9f95e1be55aeb2cc2c38de69d900946e 100644
(file)
--- a/
src/cgroup.c
+++ b/
src/cgroup.c
@@
-70,12
+70,7
@@
int cgroup_bonding_realize(CGroupBonding *b) {
goto fail;
}
goto fail;
}
- if (b->inherit)
- r = cgroup_create_cgroup_from_parent(b->cgroup, true);
- else
- r = cgroup_create_cgroup(b->cgroup, true);
-
- if (r != 0) {
+ if ((r = cgroup_create_cgroup(b->cgroup, true)) != 0) {
r = translate_error(r, errno);
goto fail;
}
r = translate_error(r, errno);
goto fail;
}
@@
-194,7
+189,10
@@
int cgroup_bonding_kill(CGroupBonding *b, int sig) {
r = 0;
goto kill_done;
} else {
r = 0;
goto kill_done;
} else {
- r = translate_error(r, errno);
+ if (r == ECGOTHER && errno == ENOENT)
+ r = ESRCH;
+ else
+ r = translate_error(r, errno);
break;
}
}
break;
}
}