tizen: Use unique directory prefix for baselibs packages

[platform/kernel/linux-rpi.git] / block / blk-cgroup.h

diff --git a/block/blk-cgroup.h b/block/blk-cgroup.h
index 624c03c..b927a4a 100644 (file)
--- 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;