projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[linux-2.6-microblaze.git]
/
kernel
/
cgroup.c
diff --git
a/kernel/cgroup.c
b/kernel/cgroup.c
index
bb263d0
..
04cfe8a
100644
(file)
--- a/
kernel/cgroup.c
+++ b/
kernel/cgroup.c
@@
-1909,7
+1909,7
@@
static void cgroup_kill_sb(struct super_block *sb)
*
* And don't kill the default root.
*/
- if (
css_has_online_children(&root->cgrp.self
) ||
+ if (
!list_empty(&root->cgrp.self.children
) ||
root == &cgrp_dfl_root)
cgroup_put(&root->cgrp);
else