summaryrefslogtreecommitdiffstats
path: root/kernel/block/blk-timeout.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/block/blk-timeout.c')
-rw-r--r--kernel/block/blk-timeout.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/block/blk-timeout.c b/kernel/block/blk-timeout.c
index 246dfb16c..aa40aa933 100644
--- a/kernel/block/blk-timeout.c
+++ b/kernel/block/blk-timeout.c
@@ -158,11 +158,13 @@ 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);