summaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup.c
diff options
context:
space:
mode:
authorTejun Heo2013-01-09 17:05:10 +0100
committerTejun Heo2013-01-09 17:05:10 +0100
commit356d2e581032b686da0854c7f17de2027c872762 (patch)
treec3c10018d5856523ba6a8a3816b433a1b5214412 /block/blk-cgroup.c
parentcfq-iosched: Print sync-noidle information in blktrace messages (diff)
downloadkernel-qcow2-linux-356d2e581032b686da0854c7f17de2027c872762.tar.gz
kernel-qcow2-linux-356d2e581032b686da0854c7f17de2027c872762.tar.xz
kernel-qcow2-linux-356d2e581032b686da0854c7f17de2027c872762.zip
blkcg: fix minor bug in blkg_alloc()
blkg_alloc() was mistakenly checking blkcg_policy_enabled() twice. The latter test should have been on whether pol->pd_init_fn() exists. This doesn't cause actual problems because both blkcg policies implement pol->pd_init_fn(). Fix it. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Vivek Goyal <vgoyal@redhat.com>
Diffstat (limited to 'block/blk-cgroup.c')
-rw-r--r--block/blk-cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index b8858fb0cafa..7ef747b7f056 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -114,7 +114,7 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q,
pd->blkg = blkg;
/* invoke per-policy init */
- if (blkcg_policy_enabled(blkg->q, pol))
+ if (pol->pd_init_fn)
pol->pd_init_fn(blkg);
}