Message ID | 1272944228-30511-10-git-send-email-andmike@linux.vnet.ibm.com (mailing list archive) |
---|---|
State | Changes Requested, archived |
Delegated to: | Mike Snitzer |
Headers | show |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 73182db..68e4bd7 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -121,11 +121,19 @@ static void scsi_requeue_request(struct request_queue *q, struct request *req, unsigned long flags; spin_lock_irqsave(q->queue_lock, flags); + if (blk_request_aborted(req)) { + spin_unlock_irqrestore(q->queue_lock, flags); + scsi_unprep_fn(q, req); + blk_end_request_all(req, -EIO); + goto out; + } + if (unprep) scsi_unprep_request(req); blk_requeue_request(q, req); spin_unlock_irqrestore(q->queue_lock, flags); +out: scsi_run_queue(q); }