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>
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 3d49552..8228385 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -78,8 +78,8 @@
if (!pd)
continue;
- if (pol && pol->ops.pd_exit_fn)
- pol->ops.pd_exit_fn(blkg);
+ if (pol && pol->pd_exit_fn)
+ pol->pd_exit_fn(blkg);
kfree(pd);
}
@@ -132,7 +132,7 @@
struct blkcg_policy *pol = blkcg_policy[i];
if (blkcg_policy_enabled(blkg->q, pol))
- pol->ops.pd_init_fn(blkg);
+ pol->pd_init_fn(blkg);
}
return blkg;
@@ -305,8 +305,8 @@
struct blkcg_policy *pol = blkcg_policy[i];
if (blkcg_policy_enabled(blkg->q, pol) &&
- pol->ops.pd_reset_stats_fn)
- pol->ops.pd_reset_stats_fn(blkg);
+ pol->pd_reset_stats_fn)
+ pol->pd_reset_stats_fn(blkg);
}
}
@@ -758,7 +758,7 @@
blkg->pd[pol->plid] = pd;
pd->blkg = blkg;
- pol->ops.pd_init_fn(blkg);
+ pol->pd_init_fn(blkg);
spin_unlock(&blkg->blkcg->lock);
}
@@ -804,8 +804,8 @@
/* grab blkcg lock too while removing @pd from @blkg */
spin_lock(&blkg->blkcg->lock);
- if (pol->ops.pd_exit_fn)
- pol->ops.pd_exit_fn(blkg);
+ if (pol->pd_exit_fn)
+ pol->pd_exit_fn(blkg);
kfree(blkg->pd[pol->plid]);
blkg->pd[pol->plid] = NULL;
diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 18b021e..44cb908 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -99,19 +99,17 @@
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;
diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 6a0a17a..46310ec 100644
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1100,13 +1100,12 @@
}
static struct blkcg_policy blkcg_policy_throtl = {
- .ops = {
- .pd_init_fn = throtl_pd_init,
- .pd_exit_fn = throtl_pd_exit,
- .pd_reset_stats_fn = throtl_pd_reset_stats,
- },
- .pd_size = sizeof(struct throtl_grp),
- .cftypes = throtl_files,
+ .pd_size = sizeof(struct throtl_grp),
+ .cftypes = throtl_files,
+
+ .pd_init_fn = throtl_pd_init,
+ .pd_exit_fn = throtl_pd_exit,
+ .pd_reset_stats_fn = throtl_pd_reset_stats,
};
bool blk_throtl_bio(struct request_queue *q, struct bio *bio)
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 7865cc3..832b2ac 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -4165,12 +4165,11 @@
#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