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

Commit 55ce0da1 authored Oct 30, 2015 by Christoph Hellwig Committed by Jens Axboe Nov 24, 2015

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: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens 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)