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);
 	}