diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cgroup.h | 4 | ||||
| -rw-r--r-- | include/linux/sched.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index ed3e92e41c6e..3cb7d04308cd 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h | |||
| @@ -75,7 +75,7 @@ struct cgroup_subsys_state { | |||
| 75 | 75 | ||
| 76 | unsigned long flags; | 76 | unsigned long flags; |
| 77 | /* ID for this css, if possible */ | 77 | /* ID for this css, if possible */ |
| 78 | struct css_id *id; | 78 | struct css_id __rcu *id; |
| 79 | }; | 79 | }; |
| 80 | 80 | ||
| 81 | /* bits in struct cgroup_subsys_state flags field */ | 81 | /* bits in struct cgroup_subsys_state flags field */ |
| @@ -205,7 +205,7 @@ struct cgroup { | |||
| 205 | struct list_head children; /* my children */ | 205 | struct list_head children; /* my children */ |
| 206 | 206 | ||
| 207 | struct cgroup *parent; /* my parent */ | 207 | struct cgroup *parent; /* my parent */ |
| 208 | struct dentry *dentry; /* cgroup fs entry, RCU protected */ | 208 | struct dentry __rcu *dentry; /* cgroup fs entry, RCU protected */ |
| 209 | 209 | ||
| 210 | /* Private pointers for each registered subsystem */ | 210 | /* Private pointers for each registered subsystem */ |
| 211 | struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT]; | 211 | struct cgroup_subsys_state *subsys[CGROUP_SUBSYS_COUNT]; |
diff --git a/include/linux/sched.h b/include/linux/sched.h index 1e2a6db2d7dd..bbffd087476c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
| @@ -1418,7 +1418,7 @@ struct task_struct { | |||
| 1418 | #endif | 1418 | #endif |
| 1419 | #ifdef CONFIG_CGROUPS | 1419 | #ifdef CONFIG_CGROUPS |
| 1420 | /* Control Group info protected by css_set_lock */ | 1420 | /* Control Group info protected by css_set_lock */ |
| 1421 | struct css_set *cgroups; | 1421 | struct css_set __rcu *cgroups; |
| 1422 | /* cg_list protected by css_set_lock and tsk->alloc_lock */ | 1422 | /* cg_list protected by css_set_lock and tsk->alloc_lock */ |
| 1423 | struct list_head cg_list; | 1423 | struct list_head cg_list; |
| 1424 | #endif | 1424 | #endif |
