X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=block%2Fblk-cgroup.h;h=b927a4a0ad0301db43a6aad657c49c67f4cb880b;hb=refs%2Fheads%2Ftizen;hp=624c03c8fe64e37f4ff742b27a1d1fa2d2588c39;hpb=7994beabfbb9a15c069eba7833a00f5ff4da1172;p=platform%2Fkernel%2Flinux-rpi.git

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 624c03c..b927a4a 100644
--- a/block/blk-cgroup.h
+++ b/block/blk-cgroup.h
@@ -249,12 +249,11 @@ static inline struct blkcg_gq *blkg_lookup(struct blkcg *blkcg,
 {
 	struct blkcg_gq *blkg;
 
-	WARN_ON_ONCE(!rcu_read_lock_held());
-
 	if (blkcg == &blkcg_root)
 		return q->root_blkg;
 
-	blkg = rcu_dereference(blkcg->blkg_hint);
+	blkg = rcu_dereference_check(blkcg->blkg_hint,
+			lockdep_is_held(&q->queue_lock));
 	if (blkg && blkg->q == q)
 		return blkg;