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

Commit 0f1f53a7 authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.2.8 : Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED 



[jejb: drop rejecting hunk altered by target busy patches]
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent a8e497d5

drivers/scsi/lpfc/lpfc_scsi.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -653,7 +653,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, 
			break;

			break;

		case IOSTAT_NPORT_BSY:

		case IOSTAT_NPORT_BSY:

		case IOSTAT_FABRIC_BSY:

		case IOSTAT_FABRIC_BSY:

			cmd->result = ScsiResult(DID_BUS_BUSY, 0);

			cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0);

			break;

			break;

		case IOSTAT_LOCAL_REJECT:

		case IOSTAT_LOCAL_REJECT:

			if (lpfc_cmd->result == IOERR_INVALID_RPI ||

			if (lpfc_cmd->result == IOERR_INVALID_RPI ||
@@ -669,7 +669,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn, 




		if (!pnode || !NLP_CHK_NODE_ACT(pnode)

		if (!pnode || !NLP_CHK_NODE_ACT(pnode)

		    || (pnode->nlp_state != NLP_STE_MAPPED_NODE))

		    || (pnode->nlp_state != NLP_STE_MAPPED_NODE))

			cmd->result = ScsiResult(DID_BUS_BUSY, SAM_STAT_BUSY);

			cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED,

						 SAM_STAT_BUSY);

	} else {

	} else {

		cmd->result = ScsiResult(DID_OK, 0);

		cmd->result = ScsiResult(DID_OK, 0);

	}

	}