X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-timeout.c;h=972a63f848fbb8541a099ae80ecce660cbe826cf;hb=64c2eae225137a8f5a88b6a416fc182d36e8ae9f;hp=9b4ad138bb33a4559a98fec2e0edc2136b8eff52;hpb=581d4e28d9195aa8b2231383dbabc288988d615e;p=linux-2.6-omap-h63xx.git

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 9b4ad138bb3..972a63f848f 100644
--- a/block/blk-timeout.c
+++ b/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);
 }