Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4576aed authored by Mike Snitzer's avatar Mike Snitzer Committed by Jens Axboe
Browse files

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



The md->wait waitqueue is used by both bio-based and request-based DM.
Commit dbd3bbd2 ("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: dbd3bbd2 ("dm rq: leverage blk_mq_queue_busy() to check for outstanding IO")
Signed-off-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6451fe73

drivers/md/dm-rq.c

+2 −4
Original line number Diff line number Diff line
@@ -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)

{

	/* nudge anyone waiting on suspend queue */

	if (unlikely(waitqueue_active(&md->wait))) {

		if (!blk_mq_queue_busy(md->queue))

	if (unlikely(waitqueue_active(&md->wait)))

		wake_up(&md->wait);

	}



	/*

	 * dm_put() must be at the end of this function. See the comment above

drivers/md/dm.c

+9 −1
Original line number Diff line number Diff line
@@ -646,7 +646,7 @@ static void free_tio(struct dm_target_io *tio) 
	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;

	struct hd_struct *part = &dm_disk(md)->part0;
@@ -660,6 +660,14 @@ static bool md_in_flight(struct mapped_device *md) 
	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)

{

	struct mapped_device *md = io->md;