aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2008-08-24 21:50:18 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-10-13 09:28:54 -0400
commit0f1f53a7efd60d7cdd8e82925f0c62dcf64ba092 (patch)
tree9350e9df7683ffa14da6d53a25c706cd542fc133 /drivers/scsi/lpfc
parenta8e497d51e6adb2dd6ef307ae76f3433a4dbe895 (diff)
[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: James Smart <james.smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/lpfc')
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 3606b7098fc1..5dae4d306758 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -653,7 +653,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
653 break; 653 break;
654 case IOSTAT_NPORT_BSY: 654 case IOSTAT_NPORT_BSY:
655 case IOSTAT_FABRIC_BSY: 655 case IOSTAT_FABRIC_BSY:
656 cmd->result = ScsiResult(DID_BUS_BUSY, 0); 656 cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0);
657 break; 657 break;
658 case IOSTAT_LOCAL_REJECT: 658 case IOSTAT_LOCAL_REJECT:
659 if (lpfc_cmd->result == IOERR_INVALID_RPI || 659 if (lpfc_cmd->result == IOERR_INVALID_RPI ||
@@ -669,7 +669,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
669 669
670 if (!pnode || !NLP_CHK_NODE_ACT(pnode) 670 if (!pnode || !NLP_CHK_NODE_ACT(pnode)
671 || (pnode->nlp_state != NLP_STE_MAPPED_NODE)) 671 || (pnode->nlp_state != NLP_STE_MAPPED_NODE))
672 cmd->result = ScsiResult(DID_BUS_BUSY, SAM_STAT_BUSY); 672 cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED,
673 SAM_STAT_BUSY);
673 } else { 674 } else {
674 cmd->result = ScsiResult(DID_OK, 0); 675 cmd->result = ScsiResult(DID_OK, 0);
675 } 676 }