korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-12 05:24:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

dm: fix request-based dm's use of dm_wait_for_completion

Browse Source 
The md->wait waitqueue is used by both bio-based and request-based DM.
Commit dbd3bbd291 ("dm rq: leverage blk_mq_queue_busy() to check for
outstanding IO") lost sight of the requirement that
dm_wait_for_completion() must work with all types of DM devices.

Fix md_in_flight() to call the blk-mq or bio-based method accordingly.

Fixes: dbd3bbd291 ("dm rq: leverage blk_mq_queue_busy() to check for outstanding IO")
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Mike Snitzer 2018-12-11 09:10:26 -05:00 committed by Jens Axboe
parent 6451fe73fa
commit c4576aed8d
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/dm-rq.c
View File

@ -131,10 +131,8 @@ 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) static void rq_completed(struct mapped_device *md, int rw, bool run_queue)
{ {
/* nudge anyone waiting on suspend queue */ /* nudge anyone waiting on suspend queue */
if (unlikely(waitqueue_active(&md->wait))) { if (unlikely(waitqueue_active(&md->wait)))
if (!blk_mq_queue_busy(md->queue))
wake_up(&md->wait); wake_up(&md->wait);
}
/* /*
* dm_put() must be at the end of this function. See the comment above * dm_put() must be at the end of this function. See the comment above

10
drivers/md/dm.c
View File

@ -646,7 +646,7 @@ static void free_tio(struct dm_target_io *tio)
bio_put(&tio->clone); bio_put(&tio->clone);
} }
static bool md_in_flight(struct mapped_device *md) static bool md_in_flight_bios(struct mapped_device *md)
{ {
int cpu; int cpu;
struct hd_struct *part = &dm_disk(md)->part0; struct hd_struct *part = &dm_disk(md)->part0;
@ -660,6 +660,14 @@ static bool md_in_flight(struct mapped_device *md)
return sum != 0; return sum != 0;
} }
static bool md_in_flight(struct mapped_device *md)
{
if (queue_is_mq(md->queue))
return blk_mq_queue_busy(md->queue);
else
return md_in_flight_bios(md);
}
static void start_io_acct(struct dm_io *io) static void start_io_acct(struct dm_io *io)
{ {
struct mapped_device *md = io->md; struct mapped_device *md = io->md;