block: fix blk_abort_request on blk-mq

Signed-off-by: Christoph Hellwig <[email protected]>

Moved blk_mq_rq_timed_out() definition to the private blk-mq.h header.

Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
Christoph Hellwig 2014-09-22 10:21:48 -06:00 • committed by Jens Axboe
commit 9041583765
3 changed files with 8 additions and 2 deletions

View file

@ -7,6 +7,7 @@
#include <linux/fault-inject.h>
#include "blk.h"
#include "blk-mq.h"
#ifdef CONFIG_FAIL_IO_TIMEOUT
@ -158,7 +159,10 @@ void blk_abort_request(struct request *req)
if (blk_mark_rq_complete(req))
return;
blk_delete_timer(req);
blk_rq_timed_out(req);
if (req->q->mq_ops)
blk_mq_rq_timed_out(req, false);
else
blk_rq_timed_out(req);
}
EXPORT_SYMBOL_GPL(blk_abort_request);