From f506764b8e4ac77bee329a53b1860614c85d83a8 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 25 Oct 2011 15:51:48 +0200
Subject: [PATCH] --- yaml --- r: 273814 b: refs/heads/master c:
 334c2b0b8b2ab186fa198413386cba41fffcb4f2 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index e5fdcce3058a..d6604fef7737 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a38eb630fa224d6fba8c14a4063174bc5e0f63bb
+refs/heads/master: 334c2b0b8b2ab186fa198413386cba41fffcb4f2
diff --git a/trunk/block/blk-throttle.c b/trunk/block/blk-throttle.c
index 8edb9499b509..4553245d9317 100644
--- a/trunk/block/blk-throttle.c
+++ b/trunk/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);