diff options
author | James Smart <james.smart@emulex.com> | 2013-04-17 20:18:47 -0400 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-05-02 16:07:51 -0400 |
commit | ea714f3dab0484b38fa6040ba45d2be7c4c5b752 (patch) | |
tree | 0df5e8c847c45a28b3eadc312a56cffbc98893bf /drivers/scsi/lpfc/lpfc_sli.c | |
parent | a88dbb6a960675f15fa02b4f057388b2b4bc8286 (diff) |
[SCSI] lpfc 8.3.39: Fixed system panic during EEH recovery due to midlayer acting on outstanding I/O
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_sli.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_sli.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index b78244a30f29..c13ab4fd36b9 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
@@ -8453,10 +8453,14 @@ __lpfc_sli_issue_iocb_s4(struct lpfc_hba *phba, uint32_t ring_number, | |||
8453 | 8453 | ||
8454 | if ((piocb->iocb_flag & LPFC_IO_FCP) || | 8454 | if ((piocb->iocb_flag & LPFC_IO_FCP) || |
8455 | (piocb->iocb_flag & LPFC_USE_FCPWQIDX)) { | 8455 | (piocb->iocb_flag & LPFC_USE_FCPWQIDX)) { |
8456 | if (unlikely(!phba->sli4_hba.fcp_wq)) | ||
8457 | return IOCB_ERROR; | ||
8456 | if (lpfc_sli4_wq_put(phba->sli4_hba.fcp_wq[piocb->fcp_wqidx], | 8458 | if (lpfc_sli4_wq_put(phba->sli4_hba.fcp_wq[piocb->fcp_wqidx], |
8457 | &wqe)) | 8459 | &wqe)) |
8458 | return IOCB_ERROR; | 8460 | return IOCB_ERROR; |
8459 | } else { | 8461 | } else { |
8462 | if (unlikely(!phba->sli4_hba.els_wq)) | ||
8463 | return IOCB_ERROR; | ||
8460 | if (lpfc_sli4_wq_put(phba->sli4_hba.els_wq, &wqe)) | 8464 | if (lpfc_sli4_wq_put(phba->sli4_hba.els_wq, &wqe)) |
8461 | return IOCB_ERROR; | 8465 | return IOCB_ERROR; |
8462 | } | 8466 | } |