diff options
| author | James Smart <james.smart@emulex.com> | 2012-03-01 22:38:42 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-03-27 08:26:34 +0100 |
| commit | 8a0cee4bfa92fb4acaf93e86780ceab3694ca6d5 (patch) | |
| tree | 66e929dd8d3c959166261c026ef10007e0930c95 | |
| parent | 4ac9b22625333f9d86c01df702c83d2dfe732131 (diff) | |
| download | op-kernel-dev-8a0cee4bfa92fb4acaf93e86780ceab3694ca6d5.zip op-kernel-dev-8a0cee4bfa92fb4acaf93e86780ceab3694ca6d5.tar.gz | |
[SCSI] lpfc 8.3.30: Revert fix for Link Pull Causes I/O Failures
Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 9 | ||||
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.h | 1 |
2 files changed, 0 insertions, 10 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 2e65168..88f3a83 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -4187,15 +4187,6 @@ lpfc_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) cmnd->result = err; goto out_fail_command; } - /* - * Do not let the mid-layer retry I/O too fast. If an I/O is retried - * without waiting a bit then indicate that the device is busy. - */ - if (cmnd->retries && - time_before(jiffies, (cmnd->jiffies_at_alloc + - msecs_to_jiffies(LPFC_RETRY_PAUSE * - cmnd->retries)))) - return SCSI_MLQUEUE_DEVICE_BUSY; ndlp = rdata->pnode; if ((scsi_get_prot_op(cmnd) != SCSI_PROT_NORMAL) && diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h index e2e3304..21a2ffe 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.h +++ b/drivers/scsi/lpfc/lpfc_scsi.h @@ -164,5 +164,4 @@ struct lpfc_scsi_buf { #define LPFC_SCSI_DMA_EXT_SIZE 264 #define LPFC_BPL_SIZE 1024 -#define LPFC_RETRY_PAUSE 300 #define MDAC_DIRECT_CMD 0x22 |
