summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-06-03 17:57:16 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2013-06-03 17:57:16 +0900
commit7d80fea4263d9a83ffedea448afa8510b05d04d0 (patch)
tree202118fd64ea1a661e3945e1a5bf13ef2d6f90eb /include
parent338e33acd820fa89b8a2d5b6574233784702f618 (diff)
parent2a0ff3fbe39bc93f719ff857e5a359d9780579ff (diff)
downloadlinux-3.10-7d80fea4263d9a83ffedea448afa8510b05d04d0.tar.gz
linux-3.10-7d80fea4263d9a83ffedea448afa8510b05d04d0.tar.bz2
linux-3.10-7d80fea4263d9a83ffedea448afa8510b05d04d0.zip
Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
Pull cgroup fixes from Tejun Heo: - Fix for yet another xattr bug which may lead to NULL deref. - A subtle bug in for_each_descendant_pre(). This bug requires quite specific conditions to trigger and isn't too likely to actually happen in the wild, but maybe that just makes it that much more nastier. - A warning message added for silly cgroup re-mount (not -o remount, but unmount followed by mount) behavior. * 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: cgroup: warn about mismatching options of a new mount of an existing hierarchy cgroup: fix a subtle bug in descendant pre-order walk cgroup: initialize xattr before calling d_instantiate()
Diffstat (limited to 'include')
-rw-r--r--include/linux/cgroup.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index 5047355b9a0..8bda1294c03 100644
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -707,7 +707,7 @@ struct cgroup *cgroup_rightmost_descendant(struct cgroup *pos);
*
* If a subsystem synchronizes against the parent in its ->css_online() and
* before starting iterating, and synchronizes against @pos on each
- * iteration, any descendant cgroup which finished ->css_offline() is
+ * iteration, any descendant cgroup which finished ->css_online() is
* guaranteed to be visible in the future iterations.
*
* In other words, the following guarantees that a descendant can't escape