diff options
| author | Tejun Heo <tj@kernel.org> | 2014-02-11 17:02:59 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-02-11 17:02:59 +0100 |
| commit | 398f878789fceb51bf5e424b753a3756643513c4 (patch) | |
| tree | cd80a446bd1e2f1adc5652a805ac2f98a40b003e /include | |
| parent | Merge branch 'driver-core-next' into cgroup/for-3.15 (diff) | |
| parent | cgroup: protect modifications to cgroup_idr with cgroup_mutex (diff) | |
| download | linux-398f878789fceb51bf5e424b753a3756643513c4.tar.xz linux-398f878789fceb51bf5e424b753a3756643513c4.zip | |
Merge branch 'cgroup/for-3.14-fixes' into cgroup/for-3.15
Pull for-3.14-fixes to receive 0ab02ca8f887 ("cgroup: protect
modifications to cgroup_idr with cgroup_mutex") prior to kernfs
conversion series to avoid non-trivial conflicts.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/cgroup.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 198c7fcd727e..c86ba7ff7a7e 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h @@ -151,6 +151,8 @@ struct cgroup { * * The ID of the root cgroup is always 0, and a new cgroup * will be assigned with a smallest available ID. + * + * Allocating/Removing ID must be protected by cgroup_mutex. */ int id; |