Merge branch 'upstream/jump-label-noearly' of git://git.kernel.org/pub/scm/linux...

[pandora-kernel.git] / block / blk-throttle.c

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 8edb949..4553245 100644 (file)
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
@@ -1218,7 +1218,7 @@ void blk_throtl_drain(struct request_queue *q)
        struct bio_list bl;
        struct bio *bio;
 
-       lockdep_is_held(q->queue_lock);
+       WARN_ON_ONCE(!queue_is_locked(q));
 
        bio_list_init(&bl);