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_init.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_init.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_init.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 291c46aa9846..7af1eabf5ebc 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
| @@ -9314,15 +9314,15 @@ lpfc_sli_prep_dev_for_reset(struct lpfc_hba *phba) | |||
| 9314 | /* Block all SCSI devices' I/Os on the host */ | 9314 | /* Block all SCSI devices' I/Os on the host */ |
| 9315 | lpfc_scsi_dev_block(phba); | 9315 | lpfc_scsi_dev_block(phba); |
| 9316 | 9316 | ||
| 9317 | /* Flush all driver's outstanding SCSI I/Os as we are to reset */ | ||
| 9318 | lpfc_sli_flush_fcp_rings(phba); | ||
| 9319 | |||
| 9317 | /* stop all timers */ | 9320 | /* stop all timers */ |
| 9318 | lpfc_stop_hba_timers(phba); | 9321 | lpfc_stop_hba_timers(phba); |
| 9319 | 9322 | ||
| 9320 | /* Disable interrupt and pci device */ | 9323 | /* Disable interrupt and pci device */ |
| 9321 | lpfc_sli_disable_intr(phba); | 9324 | lpfc_sli_disable_intr(phba); |
| 9322 | pci_disable_device(phba->pcidev); | 9325 | pci_disable_device(phba->pcidev); |
| 9323 | |||
| 9324 | /* Flush all driver's outstanding SCSI I/Os as we are to reset */ | ||
| 9325 | lpfc_sli_flush_fcp_rings(phba); | ||
| 9326 | } | 9326 | } |
| 9327 | 9327 | ||
| 9328 | /** | 9328 | /** |
| @@ -10067,6 +10067,9 @@ lpfc_sli4_prep_dev_for_reset(struct lpfc_hba *phba) | |||
| 10067 | /* Block all SCSI devices' I/Os on the host */ | 10067 | /* Block all SCSI devices' I/Os on the host */ |
| 10068 | lpfc_scsi_dev_block(phba); | 10068 | lpfc_scsi_dev_block(phba); |
| 10069 | 10069 | ||
| 10070 | /* Flush all driver's outstanding SCSI I/Os as we are to reset */ | ||
| 10071 | lpfc_sli_flush_fcp_rings(phba); | ||
| 10072 | |||
| 10070 | /* stop all timers */ | 10073 | /* stop all timers */ |
| 10071 | lpfc_stop_hba_timers(phba); | 10074 | lpfc_stop_hba_timers(phba); |
| 10072 | 10075 | ||
| @@ -10074,9 +10077,6 @@ lpfc_sli4_prep_dev_for_reset(struct lpfc_hba *phba) | |||
| 10074 | lpfc_sli4_disable_intr(phba); | 10077 | lpfc_sli4_disable_intr(phba); |
| 10075 | lpfc_sli4_queue_destroy(phba); | 10078 | lpfc_sli4_queue_destroy(phba); |
| 10076 | pci_disable_device(phba->pcidev); | 10079 | pci_disable_device(phba->pcidev); |
| 10077 | |||
| 10078 | /* Flush all driver's outstanding SCSI I/Os as we are to reset */ | ||
| 10079 | lpfc_sli_flush_fcp_rings(phba); | ||
| 10080 | } | 10080 | } |
| 10081 | 10081 | ||
| 10082 | /** | 10082 | /** |