summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-06-04 15:21:00 +0900
committerJens Axboe <axboe@kernel.dk>2012-06-04 10:03:21 +0200
commit9b2ea86bc9e940950a088e9795ab28f006e73276 (patch)
tree8bb42b9a25bd723fe838cc6a4fa3b077a02e50b4
parentffea73fc723a12fdde4c9fb3fcce5d154d1104a1 (diff)
downloadlinux-3.10-9b2ea86bc9e940950a088e9795ab28f006e73276.tar.gz
linux-3.10-9b2ea86bc9e940950a088e9795ab28f006e73276.tar.bz2
linux-3.10-9b2ea86bc9e940950a088e9795ab28f006e73276.zip
blkcg: fix blkg_alloc() failure path
When policy data allocation fails in the middle, blkg_alloc() invokes blkg_free() to destroy the half constructed blkg. This ends up calling pd_exit_fn() on policy datas which didn't go through pd_init_fn(). Fix it by making blkg_alloc() call pd_init_fn() immediately after each policy data allocation. Signed-off-by: Tejun Heo <tj@kernel.org> Acked-by: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--block/blk-cgroup.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 02cf6335e9b..4ab7420ba46 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -125,12 +125,8 @@ static struct blkcg_gq *blkg_alloc(struct blkcg *blkcg, struct request_queue *q)
blkg->pd[i] = pd;
pd->blkg = blkg;
- }
-
- /* invoke per-policy init */
- for (i = 0; i < BLKCG_MAX_POLS; i++) {
- struct blkcg_policy *pol = blkcg_policy[i];
+ /* invoke per-policy init */
if (blkcg_policy_enabled(blkg->q, pol))
pol->pd_init_fn(blkg);
}