fnic: Using rport->dd_data to check rport online instead of rport_lookup.

When issuing I/O we check if rport is online through libfc
rport_lookup() function which needs to be protected by mutex lock that
cannot acquired in I/O context. The change is to use midlayer remote
port s dd_data which is preserved until its devloss timeout and no
protection is required.  The the scsi_cmnd error code is expected to be
in the left 16 bits of the result field. Changed to correct this.  Fnic
driver version changed from 1.6.0.20 to 1.6.0.21

Signed-off-by: Satish Kharat <satishkh@cisco.com>
Signed-off-by: Sesidhar Baddela <sebaddel@cisco.com>
Reviewed-by: Ewan Milne <emilne@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h
index 1023eaea17f3d8e29587417f057ca7ae11c35f1e..9ddc9200e0a48b00632bbc441c492679786ec570 100644 (file)
--- a/drivers/scsi/fnic/fnic.h
+++ b/drivers/scsi/fnic/fnic.h
@@ -39,7 +39,7 @@
 
 #define DRV_NAME               "fnic"
 #define DRV_DESCRIPTION                "Cisco FCoE HBA Driver"
-#define DRV_VERSION            "1.6.0.20"
+#define DRV_VERSION            "1.6.0.21"
 #define PFX                    DRV_NAME ": "
 #define DFX                     DRV_NAME "%d: "
 

diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 588ffd9a33d63fd814118644d1fea406f80be436..d9fd2f841585cca6850d1c9000739b7eef69a1d1 100644 (file)
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -439,7 +439,6 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
        int sg_count = 0;
        unsigned long flags = 0;
        unsigned long ptr;
-       struct fc_rport_priv *rdata;
        spinlock_t *io_lock = NULL;
        int io_lock_acquired = 0;
 
@@ -455,14 +454,17 @@ static int fnic_queuecommand_lck(struct scsi_cmnd *sc, void (*done)(struct scsi_
                return 0;
        }
 
-       rdata = lp->tt.rport_lookup(lp, rport->port_id);
-       if (!rdata || (rdata->rp_state == RPORT_ST_DELETE)) {
-               FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
-                       "returning IO as rport is removed\n");
-               atomic64_inc(&fnic_stats->misc_stats.rport_not_ready);
-               sc->result = DID_NO_CONNECT;
-               done(sc);
-               return 0;
+       if (rport) {
+               struct fc_rport_libfc_priv *rp = rport->dd_data;
+
+               if (!rp || rp->rp_state != RPORT_ST_READY) {
+                       FNIC_SCSI_DBG(KERN_DEBUG, fnic->lport->host,
+                               "returning DID_NO_CONNECT for IO as rport is removed\n");
+                       atomic64_inc(&fnic_stats->misc_stats.rport_not_ready);
+                       sc->result = DID_NO_CONNECT<<16;
+                       done(sc);
+                       return 0;
+               }
        }
 
        if (lp->state != LPORT_ST_READY || !(lp->link_up))