Skip to content

Commit

Permalink
[SCSI] lpfc 8.3.33: Fix scsi_eh escalation panic by checking the prop…
Browse files Browse the repository at this point in the history 
…er return status

Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  • Loading branch information
James Smart authored and James Bottomley committed Sep 14, 2012
1 parent 582dd79 commit 908e18e
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/lpfc/lpfc_scsi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

spin_lock_irq(&phba->hbalock);
Expand Down Expand Up @@ -4769,7 +4769,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);
Expand Down Expand Up @@ -4836,7 +4836,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);
Expand Down Expand Up @@ -4904,7 +4904,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;

/*
Expand Down

0 comments on commit 908e18e

Please sign in to comment.