Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b6ac5e3 authored by Satish Kharat's avatar Satish Kharat Committed by Martin K. Petersen
Browse files

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: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSesidhar Baddela <sebaddel@cisco.com>
Reviewed-by: default avatarEwan Milne <emilne@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a36f5dd0

drivers/scsi/fnic/fnic.h

+1 −1
Original line number Diff line number Diff line
@@ -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: "

drivers/scsi/fnic/fnic_scsi.c

+11 −9
Original line number Diff line number Diff line
@@ -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,15 +454,18 @@ 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)) {

	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 IO as rport is removed\n");

				"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;

			sc->result = DID_NO_CONNECT<<16;

			done(sc);

			return 0;

		}

	}



	if (lp->state != LPORT_ST_READY || !(lp->link_up))

		return SCSI_MLQUEUE_HOST_BUSY;