diff options
author | Tejun Heo <tj@kernel.org> | 2013-08-08 20:11:24 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-08-08 20:11:24 -0400 |
commit | 182446d087906de40e514573a92a97b203695f71 (patch) | |
tree | 6aee96219c82d0a64b9d389c50666c1ce0ec27ee /security/device_cgroup.c | |
parent | 67f4c36f83455b253445b2cb28ac9a2c4f85d99a (diff) |
cgroup: pass around cgroup_subsys_state instead of cgroup in file methods
cgroup is currently in the process of transitioning to using struct
cgroup_subsys_state * as the primary handle instead of struct cgroup.
Please see the previous commit which converts the subsystem methods
for rationale.
This patch converts all cftype file operations to take @css instead of
@cgroup. cftypes for the cgroup core files don't have their subsytem
pointer set. These will automatically use the dummy_css added by the
previous patch and can be converted the same way.
Most subsystem conversions are straight forwards but there are some
interesting ones.
* freezer: update_if_frozen() is also converted to take @css instead
of @cgroup for consistency. This will make the code look simpler
too once iterators are converted to use css.
* memory/vmpressure: mem_cgroup_from_css() needs to be exported to
vmpressure while mem_cgroup_from_cont() can be made static.
Updated accordingly.
* cpu: cgroup_tg() doesn't have any user left. Removed.
* cpuacct: cgroup_ca() doesn't have any user left. Removed.
* hugetlb: hugetlb_cgroup_form_cgroup() doesn't have any user left.
Removed.
* net_cls: cgrp_cls_state() doesn't have any user left. Removed.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Acked-by: Michal Hocko <mhocko@suse.cz>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Aristeu Rozanski <aris@redhat.com>
Acked-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Jens Axboe <axboe@kernel.dk>
Cc: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'security/device_cgroup.c')
-rw-r--r-- | security/device_cgroup.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 7293ac49ba7b..e0ca464fa854 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c | |||
@@ -289,10 +289,10 @@ static void set_majmin(char *str, unsigned m) | |||
289 | sprintf(str, "%u", m); | 289 | sprintf(str, "%u", m); |
290 | } | 290 | } |
291 | 291 | ||
292 | static int devcgroup_seq_read(struct cgroup *cgroup, struct cftype *cft, | 292 | static int devcgroup_seq_read(struct cgroup_subsys_state *css, |
293 | struct seq_file *m) | 293 | struct cftype *cft, struct seq_file *m) |
294 | { | 294 | { |
295 | struct dev_cgroup *devcgroup = cgroup_to_devcgroup(cgroup); | 295 | struct dev_cgroup *devcgroup = css_to_devcgroup(css); |
296 | struct dev_exception_item *ex; | 296 | struct dev_exception_item *ex; |
297 | char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN]; | 297 | char maj[MAJMINLEN], min[MAJMINLEN], acc[ACCLEN]; |
298 | 298 | ||
@@ -669,13 +669,13 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, | |||
669 | return rc; | 669 | return rc; |
670 | } | 670 | } |
671 | 671 | ||
672 | static int devcgroup_access_write(struct cgroup *cgrp, struct cftype *cft, | 672 | static int devcgroup_access_write(struct cgroup_subsys_state *css, |
673 | const char *buffer) | 673 | struct cftype *cft, const char *buffer) |
674 | { | 674 | { |
675 | int retval; | 675 | int retval; |
676 | 676 | ||
677 | mutex_lock(&devcgroup_mutex); | 677 | mutex_lock(&devcgroup_mutex); |
678 | retval = devcgroup_update_access(cgroup_to_devcgroup(cgrp), | 678 | retval = devcgroup_update_access(css_to_devcgroup(css), |
679 | cft->private, buffer); | 679 | cft->private, buffer); |
680 | mutex_unlock(&devcgroup_mutex); | 680 | mutex_unlock(&devcgroup_mutex); |
681 | return retval; | 681 | return retval; |