[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>

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 2e65168d8723caeca33c3d8420f126820cd3374a..88f3a83dbd2eaf45a36d08a0c92b8fe186158ea3 100644 (file)
--- 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 e2e33043033e71716d87be7042f38a29efbc1142..21a2ffe67eacf998089d527b736ac8f63a634ffa 100644 (file)
--- 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