mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-14 12:37:32 +00:00
[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: Mike Christie <michaelc@cs.wisc.edu> Acked-by: James Smart <James.Smart@Emulex.Com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
parent
d6d13ee19d
commit
a93ce0244f
1 changed files with 5 additions and 4 deletions
|
@ -966,10 +966,9 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd *))
|
||||||
* Catch race where our node has transitioned, but the
|
* Catch race where our node has transitioned, but the
|
||||||
* transport is still transitioning.
|
* transport is still transitioning.
|
||||||
*/
|
*/
|
||||||
if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) {
|
if (!ndlp || !NLP_CHK_NODE_ACT(ndlp))
|
||||||
cmnd->result = ScsiResult(DID_BUS_BUSY, 0);
|
goto out_target_busy;
|
||||||
goto out_fail_command;
|
|
||||||
}
|
|
||||||
lpfc_cmd = lpfc_get_scsi_buf(phba);
|
lpfc_cmd = lpfc_get_scsi_buf(phba);
|
||||||
if (lpfc_cmd == NULL) {
|
if (lpfc_cmd == NULL) {
|
||||||
lpfc_adjust_queue_depth(phba);
|
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);
|
lpfc_release_scsi_buf(phba, lpfc_cmd);
|
||||||
out_host_busy:
|
out_host_busy:
|
||||||
return SCSI_MLQUEUE_HOST_BUSY;
|
return SCSI_MLQUEUE_HOST_BUSY;
|
||||||
|
out_target_busy:
|
||||||
|
return SCSI_MLQUEUE_TARGET_BUSY;
|
||||||
|
|
||||||
out_fail_command:
|
out_fail_command:
|
||||||
done(cmnd);
|
done(cmnd);
|
||||||
|
|
Loading…
Reference in a new issue