X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2Fblk-timeout.c;h=1ec0d503cacdc95bf296776ca2dc2d1e9ac4b108;hb=c572ae4efd1b0a5cc76c5e6aae05c1b182b6a69c;hp=8f570c4c80ee822538344ef4bbcb8a94cc3ebff2;hpb=b759113499d6c7cb75fab04f56772579308bc0f8;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 8f570c4..1ec0d50 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -230,6 +230,13 @@ void blk_abort_queue(struct request_queue *q)
 	list_for_each_entry_safe(rq, tmp, &list, timeout_list)
 		blk_abort_request(rq);
 
+	/*
+	 * Occasionally, blk_abort_request() will return without
+	 * deleting the element from the list. Make sure we add those back
+	 * instead of leaving them on the local stack list.
+	 */
+	list_splice(&list, &q->timeout_list);
+
 	spin_unlock_irqrestore(q->queue_lock, flags);
 
 }