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>

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