diff options
| author | James Smart | 2008-09-07 17:51:56 +0200 |
|---|---|---|
| committer | James Bottomley | 2008-10-13 15:28:56 +0200 |
| commit | b522d7d42d7ce843885d4c6740c5bd50876a2971 (patch) | |
| tree | 56712bac7f155594941fefb20ccd9b5439bcfefc /drivers/scsi/lpfc/lpfc_scsi.c | |
| parent | [SCSI] scsi_dh_alua: remove REQ_NOMERGE (diff) | |
| download | kernel-qcow2-linux-b522d7d42d7ce843885d4c6740c5bd50876a2971.tar.gz kernel-qcow2-linux-b522d7d42d7ce843885d4c6740c5bd50876a2971.tar.xz kernel-qcow2-linux-b522d7d42d7ce843885d4c6740c5bd50876a2971.zip | |
[SCSI] lpfc 8.2.8 v2 : Revert target busy in favor of transport disrupted
Revert the target busy response in favor of the transport disrupted
response for node state transitions.
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
| -rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index 5dae4d306758..72eef7e4a891 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c @@ -1071,8 +1071,10 @@ 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)) - goto out_target_busy; + if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) { + cmnd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0); + goto out_fail_command; + } lpfc_cmd = lpfc_get_scsi_buf(phba); if (lpfc_cmd == NULL) { @@ -1118,8 +1120,6 @@ 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); |