blkcg: collapse blkcg_policy_ops into blkcg_policy

[mirror_ubuntu-zesty-kernel.git] / block / blk-cgroup.h

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 18b021e1c05f9eca406f1a34a81306daeb5239a1..44cb9086ed424238c286afa9c7c7ffd237e250f0 100644 (file)
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -99,19 +99,17 @@ typedef void (blkcg_pol_init_pd_fn)(struct blkcg_gq *blkg);
 typedef void (blkcg_pol_exit_pd_fn)(struct blkcg_gq *blkg);
 typedef void (blkcg_pol_reset_pd_stats_fn)(struct blkcg_gq *blkg);
 
-struct blkcg_policy_ops {
-       blkcg_pol_init_pd_fn            *pd_init_fn;
-       blkcg_pol_exit_pd_fn            *pd_exit_fn;
-       blkcg_pol_reset_pd_stats_fn     *pd_reset_stats_fn;
-};
-
 struct blkcg_policy {
-       struct blkcg_policy_ops         ops;
        int                             plid;
        /* policy specific private data size */
        size_t                          pd_size;
        /* cgroup files for the policy */
        struct cftype                   *cftypes;
+
+       /* operations */
+       blkcg_pol_init_pd_fn            *pd_init_fn;
+       blkcg_pol_exit_pd_fn            *pd_exit_fn;
+       blkcg_pol_reset_pd_stats_fn     *pd_reset_stats_fn;
 };
 
 extern struct blkcg blkcg_root;