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:
1b73da1
)
cgroup: fix inverted condition
author
Michal Schmidt
<mschmidt@redhat.com>
Fri, 10 Feb 2012 01:53:10 +0000
(
02:53
+0100)
committer
Michal Schmidt
<mschmidt@redhat.com>
Fri, 10 Feb 2012 01:57:45 +0000
(
02:57
+0100)
A bug was introduced in
acb14d3
"cgroup: when getting cgroup empty
notifications, always search up the tree".
When the given cgroup is found the hashmap, we should be happy and
return it, not go looking up the tree for another one.
Fixes the hanging NetworkManager on shutdown for me.
src/cgroup.c
patch
|
blob
|
history
diff --git
a/src/cgroup.c
b/src/cgroup.c
index 182dd59eec5aea5d09fcada8b32c63d5ca259955..1f6139e25f752176b2d19781c1253c8e608f8dc9 100644
(file)
--- a/
src/cgroup.c
+++ b/
src/cgroup.c
@@
-364,7
+364,7
@@
int cgroup_bonding_get(Manager *m, const char *cgroup, CGroupBonding **bonding)
assert(bonding);
b = hashmap_get(m->cgroup_bondings, cgroup);
- if (
!
b) {
+ if (b) {
*bonding = b;
return 1;
}