Commit 55ce0da1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: fix blk_abort_request for blk-mq drivers 



We only added the request to the request list for the !blk-mq case,
so we should only delete it in that case as well.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent bf508e91

block/blk-timeout.c

+5 −3
Original line number Diff line number Diff line
@@ -158,12 +158,14 @@ void blk_abort_request(struct request *req) 
{

	if (blk_mark_rq_complete(req))

		return;

	blk_delete_timer(req);

	if (req->q->mq_ops)



	if (req->q->mq_ops) {

		blk_mq_rq_timed_out(req, false);

	else

	} else {

		blk_delete_timer(req);

		blk_rq_timed_out(req);

	}

}

EXPORT_SYMBOL_GPL(blk_abort_request);



unsigned long blk_rq_timeout(unsigned long timeout)