diff options
| author |   Tejun Heo <tj@kernel.org> | 2012-04-16 13:57:27 -0700 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2012-04-20 10:06:17 +0200 |
| commit | f9fcc2d3919b8eb575b3cee9274feefafb641bca (patch) | |
| tree | bb3eaeb993b21ba352c0967488a6955a40314d97 /block/cfq-iosched.c | |
| parent | blkcg: embed struct blkg_policy_data in policy specific data (diff) | |
| download | linux-dev-f9fcc2d3919b8eb575b3cee9274feefafb641bca.tar.xz linux-dev-f9fcc2d3919b8eb575b3cee9274feefafb641bca.zip | |
blkcg: collapse blkcg_policy_ops into blkcg_policy
There's no reason to keep blkcg_policy_ops separate. Collapse it into
blkcg_policy.
This patch doesn't introduce any functional change.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/cfq-iosched.c')
| -rw-r--r-- | block/cfq-iosched.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 7865cc38ea77..832b2ac8cb8d 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c @@ -4165,12 +4165,11 @@ static struct elevator_type iosched_cfq = { #ifdef CONFIG_CFQ_GROUP_IOSCHED static struct blkcg_policy blkcg_policy_cfq = { - .ops = { - .pd_init_fn = cfq_pd_init, - .pd_reset_stats_fn = cfq_pd_reset_stats, - }, - .pd_size = sizeof(struct cfq_group), - .cftypes = cfq_blkcg_files, + .pd_size = sizeof(struct cfq_group), + .cftypes = cfq_blkcg_files, + + .pd_init_fn = cfq_pd_init, + .pd_reset_stats_fn = cfq_pd_reset_stats, }; #endif |