diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 10:22:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-01 10:22:04 -0800 |
| commit | 71efa38c0eef581c69c221ceb8645f61d1e93270 (patch) | |
| tree | 456c1894e26fb3aa362fc8e1fd8382160dfcb344 /drivers/scsi/scsi_error.c | |
| parent | 96789ac4b3943fec27fb6bf2713633b01a3903ad (diff) | |
| parent | e2482fa16e9eef88344a4dca1a390d29432d4add (diff) | |
| download | op-kernel-dev-71efa38c0eef581c69c221ceb8645f61d1e93270.zip op-kernel-dev-71efa38c0eef581c69c221ceb8645f61d1e93270.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
Diffstat (limited to 'drivers/scsi/scsi_error.c')
| -rw-r--r-- | drivers/scsi/scsi_error.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 5cc97b7..ff82ccf 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c @@ -1308,7 +1308,7 @@ int scsi_decide_disposition(struct scsi_cmnd *scmd) * the request was not marked fast fail. Note that above, * even if the request is marked fast fail, we still requeue * for queue congestion conditions (QUEUE_FULL or BUSY) */ - if ((++scmd->retries) < scmd->allowed + if ((++scmd->retries) <= scmd->allowed && !blk_noretry_request(scmd->request)) { return NEEDS_RETRY; } else { @@ -1433,7 +1433,7 @@ static void scsi_eh_flush_done_q(struct list_head *done_q) list_del_init(&scmd->eh_entry); if (scsi_device_online(scmd->device) && !blk_noretry_request(scmd->request) && - (++scmd->retries < scmd->allowed)) { + (++scmd->retries <= scmd->allowed)) { SCSI_LOG_ERROR_RECOVERY(3, printk("%s: flush" " retry cmd: %p\n", current->comm, |
