Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 908e18e4 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.33: Fix scsi_eh escalation panic by checking the proper return status 



Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 582dd796

drivers/scsi/lpfc/lpfc_scsi.c

+4 −4
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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);
@@ -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;



	/*