X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=block%2Fblk-timeout.c;h=aa40aa93381b661b73d5aa0f531e247e148c56a0;hb=6ee6d6d68b2acb6de8590f8ff7c25cc35b2aefca;hp=246dfb16c3d988c4f84749065a66977b825c98b5;hpb=41cbc01f6e49e48bc3d78158cec0a2d4ff6c906d;p=firefly-linux-kernel-4.4.55.git

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 246dfb16c3d9..aa40aa93381b 100644
--- a/block/blk-timeout.c
+++ b/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);