Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

[firefly-linux-kernel-4.4.55.git] / include / linux / cgroup.h

diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
index b4f2201321cd158db1302983631b42fbf91d0185..8f78073d7caaa278017232112f0d3da05aa0d4c0 100644 (file)
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
@@ -396,9 +396,6 @@ struct cftype {
         * closes the eventfd or on cgroup removing.
         * This callback must be implemented, if you want provide
         * notification functionality.
-        *
-        * Be careful. It can be called after destroy(), so you have
-        * to keep all nesessary data, until all events are removed.
         */
        int (*unregister_event)(struct cgroup *cgrp, struct cftype *cft,
                        struct eventfd_ctx *eventfd);
@@ -533,6 +530,7 @@ static inline struct cgroup_subsys_state *task_subsys_state(
 {
        return rcu_dereference_check(task->cgroups->subsys[subsys_id],
                                     rcu_read_lock_held() ||
+                                    lockdep_is_held(&task->alloc_lock) ||
                                     cgroup_lock_is_held());
 }