Update driver to use new Host byte error code DID_TRANSPORT_DISRUPTED. This patch depends pending upstream patches described in: http://marc.info/?l=linux-scsi&m=121263014808604&w=2 Particularly: http://marc.info/?l=linux-scsi&m=121263014908607&w=2 which defines DID_TRANSPORT_DISRUPTED. This patch supercedes the lpfc patch in that series: http://marc.info/?l=linux-scsi&m=121263015008616&w=2 Signed-off-by: James Smart <james.smart@xxxxxxxxxx> --- lpfc_scsi.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff -upNr a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c --- a/drivers/scsi/lpfc/lpfc_scsi.c 2008-08-24 20:47:07.000000000 -0400 +++ b/drivers/scsi/lpfc/lpfc_scsi.c 2008-08-24 20:49:21.000000000 -0400 @@ -653,7 +653,7 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba break; case IOSTAT_NPORT_BSY: case IOSTAT_FABRIC_BSY: - cmd->result = ScsiResult(DID_BUS_BUSY, 0); + cmd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0); break; case IOSTAT_LOCAL_REJECT: if (lpfc_cmd->result == IOERR_INVALID_RPI || @@ -669,7 +669,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba if (!pnode || !NLP_CHK_NODE_ACT(pnode) || (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 { cmd->result = ScsiResult(DID_OK, 0); } @@ -1071,7 +1072,7 @@ lpfc_queuecommand(struct scsi_cmnd *cmnd * transport is still transitioning. */ if (!ndlp || !NLP_CHK_NODE_ACT(ndlp)) { - cmnd->result = ScsiResult(DID_BUS_BUSY, 0); + cmnd->result = ScsiResult(DID_TRANSPORT_DISRUPTED, 0); goto out_fail_command; } lpfc_cmd = lpfc_get_scsi_buf(phba); -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
