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

Commit a93ce024 authored by Mike Christie's avatar Mike Christie Committed by James Bottomley
Browse files

[SCSI] lpfc: use SCSI_MLQUEUE_TARGET_BUSY when catching the rport transition race 



We do want to call right back into the queuecommand during the race,
so we can just use SCSI_MLQUEUE_TARGET_BUSY.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Acked-by: default avatarJames Smart <James.Smart@Emulex.Com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent d6d13ee1

drivers/scsi/lpfc/lpfc_scsi.c

+5 −4
Original line number Diff line number Diff line
@@ -966,10 +966,9 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) 
	 * Catch race where our node has transitioned, but the

	 * transport is still transitioning.

	 */

	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {

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

		goto out_fail_command;

	}

	if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))

		goto out_target_busy;



	lpfc_cmd = lpfc_get_scsi_buf(phba);

	if (lpfc_cmd == NULL) {

		lpfc_adjust_queue_depth(phba);
@@ -1014,6 +1013,8 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *)) 
	lpfc_release_scsi_buf(phba, lpfc_cmd);

 out_host_busy:

	return SCSI_MLQUEUE_HOST_BUSY;

 out_target_busy:

	return SCSI_MLQUEUE_TARGET_BUSY;



 out_fail_command:

	done(cmnd);