aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-09-07 19:15:20 -0400
committerJens Axboe <axboe@fb.com>2014-09-08 11:55:37 -0400
commitf4da80727cfbc3590d95ff17ef8db96e6f1483a4 (patch)
treecd073c26cb66e6d2f8640c3aabb412ff22946b63 /block/blk-cgroup.h
parent55872c5a3c01f0fe7b5298d19e24e237f5b5ff06 (diff)
blkcg: remove blkcg->id
blkcg->id is a unique id given to each blkcg; however, the cgroup_subsys_state which each blkcg embeds already has ->serial_nr which can be used for the same purpose. Drop blkcg->id and replace its uses with blkcg->css.serial_nr. Rename cfq_cgroup->blkcg_id to ->blkcg_serial_nr and @id in check_blkcg_changed() to @serial_nr for consistency. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/blk-cgroup.h')
-rw-r--r--block/blk-cgroup.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index d3fd7aa3d2a3..c567865b5f1d 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -50,9 +50,6 @@ struct blkcg {
50 struct blkcg_gq *blkg_hint; 50 struct blkcg_gq *blkg_hint;
51 struct hlist_head blkg_list; 51 struct hlist_head blkg_list;
52 52
53 /* for policies to test whether associated blkcg has changed */
54 uint64_t id;
55
56 /* TODO: per-policy storage in blkcg */ 53 /* TODO: per-policy storage in blkcg */
57 unsigned int cfq_weight; /* belongs to cfq */ 54 unsigned int cfq_weight; /* belongs to cfq */
58 unsigned int cfq_leaf_weight; 55 unsigned int cfq_leaf_weight;