From d0312b5e01470f33ad6e9f3144bf02869c7d1ab7 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Wed, 9 Jan 2013 08:05:10 -0800
Subject: [PATCH] --- yaml --- r: 359495 b: refs/heads/master c:
 356d2e581032b686da0854c7f17de2027c872762 h: refs/heads/master i:   359493:
 79bb843e477b6b5bf9c2d1bec74cdb6d964c24af   359491:
 074115a2f14160baddc7453807327fb88716e0ba   359487:
 ca25985ee76bae6da00aab1daf991caec58ad300 v: v3

---
 [refs]                   | 2 +-
 trunk/block/blk-cgroup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f5109498a4d8..70760654268a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b226e5c411759eec29308f0ea38e918aa695dc7f
+refs/heads/master: 356d2e581032b686da0854c7f17de2027c872762
diff --git a/trunk/block/blk-cgroup.c b/trunk/block/blk-cgroup.c
index b8858fb0cafa..7ef747b7f056 100644
--- a/trunk/block/blk-cgroup.c
+++ b/trunk/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);
 	}