[SCSI] lpfc 8.3.42: Fix random errors using first burst

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 1242b6c4308b..49916a952bfa 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -4342,6 +4342,7 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
         char tag[2];
         uint8_t *ptr;
         bool sli4;
+        uint32_t fcpdl;
 
         if (!pnode || !NLP_CHK_NODE_ACT(pnode))
                 return;
@@ -4389,8 +4390,12 @@ lpfc_scsi_prep_cmnd(struct lpfc_vport *vport, struct lpfc_scsi_buf *lpfc_cmd,
                         iocb_cmd->ulpPU = PARM_READ_CHECK;
                         if (vport->cfg_first_burst_size &&
                             (pnode->nlp_flag & NLP_FIRSTBURST)) {
-                                piocbq->iocb.un.fcpi.fcpi_XRdy =
-                                        vport->cfg_first_burst_size;
+                                fcpdl = scsi_bufflen(scsi_cmnd);
+                                if (fcpdl < vport->cfg_first_burst_size)
+                                        piocbq->iocb.un.fcpi.fcpi_XRdy = fcpdl;
+                                else
+                                        piocbq->iocb.un.fcpi.fcpi_XRdy =
+                                                vport->cfg_first_burst_size;
                         }
                         fcp_cmnd->fcpCntl3 = WRITE_DATA;
                         phba->fc4OutputRequests++;