summaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-04-16 13:57:27 -0700
committerJens Axboe <axboe@kernel.dk>2012-04-20 10:06:17 +0200
commitf9fcc2d3919b8eb575b3cee9274feefafb641bca (patch)
treebb3eaeb993b21ba352c0967488a6955a40314d97 /block/blk-cgroup.c
parentf95a04afa80c0f4ddd645ef6a84ed118b5d1ad46 (diff)
downloadlinux-f9fcc2d3919b8eb575b3cee9274feefafb641bca.tar.bz2
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/blk-cgroup.c')
-rw-r--r--block/blk-cgroup.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 3d495528a765..82283859727e 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -78,8 +78,8 @@ static void blkg_free(struct blkcg_gq *blkg)
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 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q)
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 @@ static int blkcg_reset_stats(struct cgroup *cgroup, struct cftype *cftype,
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 @@ int blkcg_activate_policy(struct request_queue *q,
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 @@ void blkcg_deactivate_policy(struct request_queue *q,
/* 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;