Commit 9b2ea86b authored Jun 04, 2012 by Tejun Heo Committed by Jens Axboe Jun 04, 2012

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>

parent ffea73fc

block/blk-cgroup.c

+1 −5

Original line number	Diff line number	Diff line
		@@ -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];

		if (blkcg_policy_enabled(blkg->q, pol))
		pol->pd_init_fn(blkg);
		}