diff options
| author | Mike Snitzer <snitzer@redhat.com> | 2018-12-06 17:41:17 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-12-10 16:30:37 +0100 |
| commit | dbd3bbd291a03f1383de6242e7999e8487cb869b (patch) | |
| tree | 67c9990860e1ade506bdb69b04304a0b0e3f557d /drivers/md/dm-rq.c | |
| parent | dm: dont rewrite dm_disk(md)->part0.in_flight (diff) | |
| download | linux-dbd3bbd291a03f1383de6242e7999e8487cb869b.tar.xz linux-dbd3bbd291a03f1383de6242e7999e8487cb869b.zip | |
dm rq: leverage blk_mq_queue_busy() to check for outstanding IO
Now that request-based dm-multipath only supports blk-mq, make use of
the newly introduced blk_mq_queue_busy() to check for outstanding IO --
rather than (ab)using the block core's in_flight counters.
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/dm-rq.c')
| -rw-r--r-- | drivers/md/dm-rq.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c index 1f1fe9a618ea..d2397d8fcbd1 100644 --- a/drivers/md/dm-rq.c +++ b/drivers/md/dm-rq.c @@ -130,11 +130,11 @@ static void rq_end_stats(struct mapped_device *md, struct request *orig) */ static void rq_completed(struct mapped_device *md, int rw, bool run_queue) { - atomic_dec(&md->pending[rw]); - /* nudge anyone waiting on suspend queue */ - if (!md_in_flight(md)) - wake_up(&md->wait); + if (unlikely(waitqueue_active(&md->wait))) { + if (!blk_mq_queue_busy(md->queue)) + wake_up(&md->wait); + } /* * dm_put() must be at the end of this function. See the comment above @@ -436,7 +436,6 @@ ssize_t dm_attr_rq_based_seq_io_merge_deadline_store(struct mapped_device *md, static void dm_start_request(struct mapped_device *md, struct request *orig) { blk_mq_start_request(orig); - atomic_inc(&md->pending[rq_data_dir(orig)]); if (unlikely(dm_stats_used(&md->stats))) { struct dm_rq_target_io *tio = tio_from_request(orig); |