From: Vaios Papadimitriou Date: Tue, 28 Aug 2012 22:57:17 +0000 (-0700) Subject: scsi/lpfc: Fixed kernel panic after scsi_eh escalation by checking the proper return... X-Git-Tag: v2.6.39-400.9.0~314^2~16 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a08f87314ef5d5d80e9640f988a5d4329d90007e;p=users%2Fjedix%2Flinux-maple.git scsi/lpfc: Fixed kernel panic after scsi_eh escalation by checking the proper return status commit id: http://marc.info/?l=linux-scsi&m=134401197206322 Signed-off-by: Jerry Snitselaar --- diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index bd069b56040f..1b684a12eb80 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -4414,7 +4414,7 @@ lpfc_abort_handler(struct scsi_cmnd *cmnd) DECLARE_WAIT_QUEUE_HEAD_ONSTACK(waitq); status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; lpfc_cmd = (struct lpfc_scsi_buf *)cmnd->host_scribble; if (!lpfc_cmd) { @@ -4743,7 +4743,7 @@ lpfc_device_reset_handler(struct scsi_cmnd *cmnd) } pnode = rdata->pnode; status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; status = lpfc_chk_tgt_mapped(vport, cmnd); @@ -4810,7 +4810,7 @@ lpfc_target_reset_handler(struct scsi_cmnd *cmnd) } pnode = rdata->pnode; status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; status = lpfc_chk_tgt_mapped(vport, cmnd); @@ -4878,7 +4878,7 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd) sizeof(scsi_event), (char *)&scsi_event, LPFC_NL_VENDOR_ID); status = fc_block_scsi_eh(cmnd); - if (status) + if (status != 0 && status != SUCCESS) return status; /*