From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 25 Oct 2011 13:51:48 +0000 (+0200)
Subject: blk-throttle: use queue_is_locked() instead of lockdep_is_held()
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~20346^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=334c2b0b8b2ab186fa198413386cba41fffcb4f2;p=mirror_ubuntu-focal-kernel.git

blk-throttle: use queue_is_locked() instead of lockdep_is_held()

We can't use the latter if !CONFIG_LOCKDEP.

Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/block/blk-throttle.c b/block/blk-throttle.c
index 8edb9499b509..4553245d9317 100644
--- 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);