diff options
| author | Tejun Heo <tj@kernel.org> | 2013-08-09 02:11:22 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2013-08-09 02:11:22 +0200 |
| commit | 8af01f56a03e9cbd91a55d688fce1315021efba8 (patch) | |
| tree | 05c051bd8b188073bb4bf695c3a46c6592e86794 /block | |
| parent | cgroup: Merge branch 'for-3.11-fixes' into for-3.12 (diff) | |
| download | linux-8af01f56a03e9cbd91a55d688fce1315021efba8.tar.xz linux-8af01f56a03e9cbd91a55d688fce1315021efba8.zip | |
cgroup: s/cgroup_subsys_state/cgroup_css/ s/task_subsys_state/task_css/
The names of the two struct cgroup_subsys_state accessors -
cgroup_subsys_state() and task_subsys_state() - are somewhat awkward.
The former clashes with the type name and the latter doesn't even
indicate it's somehow related to cgroup.
We're about to revamp large portion of cgroup API, so, let's rename
them so that they're less awkward. Most per-controller usages of the
accessors are localized in accessor wrappers and given the amount of
scheduled changes, this isn't gonna add any noticeable headache.
Rename cgroup_subsys_state() to cgroup_css() and task_subsys_state()
to task_css(). This patch is pure rename.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Li Zefan <lizefan@huawei.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h index 8056c03a3382..628e50f6f8a8 100644 --- a/block/blk-cgroup.h +++ b/block/blk-cgroup.h @@ -181,14 +181,13 @@ void blkg_conf_finish(struct blkg_conf_ctx *ctx); static inline struct blkcg *cgroup_to_blkcg(struct cgroup *cgroup) { - return container_of(cgroup_subsys_state(cgroup, blkio_subsys_id), + return container_of(cgroup_css(cgroup, blkio_subsys_id), struct blkcg, css); } static inline struct blkcg *task_blkcg(struct task_struct *tsk) { - return container_of(task_subsys_state(tsk, blkio_subsys_id), - struct blkcg, css); + return container_of(task_css(tsk, blkio_subsys_id), struct blkcg, css); } static inline struct blkcg *bio_blkcg(struct bio *bio) |