summaryrefslogtreecommitdiffstats
path: root/block/cfq-iosched.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-04-13 13:11:29 -0700
committerJens Axboe <axboe@kernel.dk>2012-04-20 10:06:06 +0200
commitda8b066262e12d1d0a3b1e6d3486e500169bf730 (patch)
tree048eee7101b526017bbd295366bf2e95dd65e5a7 /block/cfq-iosched.c
parent8bd435b30ecacb69bbb8b2d3e251f770b807c5b2 (diff)
downloadlinux-stable-da8b066262e12d1d0a3b1e6d3486e500169bf730.tar.gz
linux-stable-da8b066262e12d1d0a3b1e6d3486e500169bf730.tar.bz2
linux-stable-da8b066262e12d1d0a3b1e6d3486e500169bf730.zip
blkcg: make blkg_conf_prep() take @pol and return with queue lock held
Add @pol to blkg_conf_prep() and let it return with queue lock held (to be released by blkg_conf_finish()). Note that @pol isn't used yet. This is to prepare for per-queue policy activation and doesn't cause any visible difference. 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index 08db2fc70c29..de95f9a2acf8 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1400,7 +1400,7 @@ static int cfqg_set_weight_device(struct cgroup *cgrp, struct cftype *cft,
struct cfq_group *cfqg;
int ret;
- ret = blkg_conf_prep(blkcg, buf, &ctx);
+ ret = blkg_conf_prep(blkcg, &blkio_policy_cfq, buf, &ctx);
if (ret)
return ret;