[SCSI] qla2xxx: Additional NPIV corrections.

Minor fixes addressing:
- rport managements during vport deletion.
- acquire proper physical-ha during qla24xx_abort_command() and
  qla24xx_queuecommand()
- do not needlessly acquire the pha for non-NPIV capable ISPs.

Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 6e14c8eaca8..d57669aa461 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -269,7 +269,7 @@ qla2x00_start_scsi(srb_t *sp)
 {
         int             ret, nseg;
         unsigned long   flags;
-        scsi_qla_host_t *ha, *pha;
+        scsi_qla_host_t *ha;
         struct scsi_cmnd *cmd;
         uint32_t        *clr_ptr;
         uint32_t        index;
@@ -283,7 +283,6 @@ qla2x00_start_scsi(srb_t *sp)
         /* Setup device pointers. */
         ret = 0;
         ha = sp->ha;
-        pha = to_qla_parent(ha);
         reg = &ha->iobase->isp;
         cmd = sp->cmd;
         /* So we know we haven't pci_map'ed anything yet */
@@ -298,7 +297,7 @@ qla2x00_start_scsi(srb_t *sp)
         }
 
         /* Acquire ring specific lock */
-        spin_lock_irqsave(&pha->hardware_lock, flags);
+        spin_lock_irqsave(&ha->hardware_lock, flags);
 
         /* Check for room in outstanding command list. */
         handle = ha->current_outstanding_cmd;
@@ -387,14 +386,14 @@ qla2x00_start_scsi(srb_t *sp)
             ha->response_ring_ptr->signature != RESPONSE_PROCESSED)
                 qla2x00_process_response_queue(ha);
 
-        spin_unlock_irqrestore(&pha->hardware_lock, flags);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
         return (QLA_SUCCESS);
 
 queuing_error:
         if (tot_dsds)
                 scsi_dma_unmap(cmd);
 
-        spin_unlock_irqrestore(&pha->hardware_lock, flags);
+        spin_unlock_irqrestore(&ha->hardware_lock, flags);
 
         return (QLA_FUNCTION_FAILED);
 }