diff --git a/[refs] b/[refs]
index bd64defa3c55..c45c6ae9c97f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 581d4e28d9195aa8b2231383dbabc288988d615e
+refs/heads/master: 7ba1fbaa4a478f72fbaf5a56af9c82a77966b4c7
diff --git a/trunk/block/blk-timeout.c b/trunk/block/blk-timeout.c
index 9b4ad138bb33..972a63f848fb 100644
--- a/trunk/block/blk-timeout.c
+++ b/trunk/block/blk-timeout.c
@@ -158,6 +158,8 @@ void blk_rq_timed_out_timer(unsigned long data)
  */
 void blk_abort_request(struct request *req)
 {
+	if (blk_mark_rq_complete(req))
+		return;
 	blk_delete_timer(req);
 	blk_rq_timed_out(req);
 }