block: use rq complete marking in blk_abort_request()

We cannot abort a request if we raced with the timeout handler already, or with the IO completion. So make blk_abort_request() mark the request as complete, and only continue if we succeeded. Found and suggested by Mike Anderson <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
mrcsosa · Oct 9, 2008 · 7ba1fba · 7ba1fba
1 parent 581d4e2
commit 7ba1fba
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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);
 }