summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJens Axboe <axboe@kernel.dk>2018-12-17 21:11:17 -0700
committerJens Axboe <axboe@kernel.dk>2018-12-17 21:31:42 -0700
commit3c94d83cb352627f221d971b05f163c17527de74 (patch)
tree60f1445af634c7162225f86c9a791b6e2a6b382c /drivers
parente5edd5f298fafda28284bafb8371e6f0b7681035 (diff)
downloadlinux-3c94d83cb352627f221d971b05f163c17527de74.tar.gz
linux-3c94d83cb352627f221d971b05f163c17527de74.tar.bz2
linux-3c94d83cb352627f221d971b05f163c17527de74.zip
blk-mq: change blk_mq_queue_busy() to blk_mq_queue_inflight()
There's a single user of this function, dm, and dm just wants to check if IO is inflight, not that it's just allocated. This fixes a hang with srp/002 in blktests with dm, where it tries to suspend but waits for inflight IO to finish first. As it checks for just allocated requests, this fails. Tested-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/dm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index c414d40d645d..dddbca63e140 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -663,7 +663,7 @@ static bool md_in_flight_bios(struct mapped_device *md)
static bool md_in_flight(struct mapped_device *md)
{
if (queue_is_mq(md->queue))
- return blk_mq_queue_busy(md->queue);
+ return blk_mq_queue_inflight(md->queue);
else
return md_in_flight_bios(md);
}