aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_scsi.c
diff options
context:
space:
mode:
authorJames Smart <James.Smart@Emulex.Com>2008-08-24 21:50:00 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-10-13 09:28:53 -0400
commitd7c255b26d8e3f12164d82093de3bf22efad2b4a (patch)
tree0b3467eda322ec2d90e5a7369891ab4ba12ff0a1 /drivers/scsi/lpfc/lpfc_scsi.c
parent34b02dcdcf1865405f4762b991965c0c3b8a3ae0 (diff)
[SCSI] lpfc 8.2.8 : Miscellaneous Bug Fixes
Miscellaneous Fixes: - Fix the wrong variable name used for checking node active usage status - Fix numerous duplicate log message numbers - Fix change KERN_WARNING messages to KERN_INFO. - Stop sending erroneous LOGO to fabric after vport is already terminated - Fix HBQ allocates that were kalloc'ing w/ GFP_KERNEL while holding a lock. - Fix gcc 4.3.2 compiler warnings and a sparse warning - Fix bugs in handling unsolicited ct event queue - Reorder some of the initial link up checks, to remove odd VPI states. - Correct poor VPI handling - Add debug messages - Expand Update_CFG mailbox definition - Fix handling of VPD data offsets - Reorder loopback flags - convert to use offsetof() 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index c1bb90cf0d06..b73968b2b8b4 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -627,9 +627,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
627 cmd->result = ScsiResult(DID_BUS_BUSY, 0); 627 cmd->result = ScsiResult(DID_BUS_BUSY, 0);
628 break; 628 break;
629 case IOSTAT_LOCAL_REJECT: 629 case IOSTAT_LOCAL_REJECT:
630 if (lpfc_cmd->result == RJT_UNAVAIL_PERM || 630 if (lpfc_cmd->result == IOERR_INVALID_RPI ||
631 lpfc_cmd->result == IOERR_NO_RESOURCES || 631 lpfc_cmd->result == IOERR_NO_RESOURCES ||
632 lpfc_cmd->result == RJT_LOGIN_REQUIRED) { 632 lpfc_cmd->result == IOERR_ABORT_REQUESTED) {
633 cmd->result = ScsiResult(DID_REQUEUE, 0); 633 cmd->result = ScsiResult(DID_REQUEUE, 0);
634 break; 634 break;
635 } /* else: fall through */ 635 } /* else: fall through */
@@ -1318,7 +1318,7 @@ lpfc_bus_reset_handler(struct scsi_cmnd *cmnd)
1318 struct lpfc_hba *phba = vport->phba; 1318 struct lpfc_hba *phba = vport->phba;
1319 struct lpfc_nodelist *ndlp = NULL; 1319 struct lpfc_nodelist *ndlp = NULL;
1320 int match; 1320 int match;
1321 int ret = SUCCESS, status, i; 1321 int ret = SUCCESS, status = SUCCESS, i;
1322 int cnt; 1322 int cnt;
1323 struct lpfc_scsi_buf * lpfc_cmd; 1323 struct lpfc_scsi_buf * lpfc_cmd;
1324 unsigned long later; 1324 unsigned long later;