* [RFC v4 13/19] fnic: Remove host_lock unlock() + lock() from fnic_queuecommand()
@ 2010-09-28 2:07 Nicholas A. Bellinger
0 siblings, 0 replies; only message in thread
From: Nicholas A. Bellinger @ 2010-09-28 2:07 UTC (permalink / raw)
To: linux-scsi, linux-kernel, Vasu Dev, Tim Chen, Andi Kleen
Cc: James Smart, Andrew Vasquez, FUJITA Tomonori, Hannes Reinecke,
Joe Eykholt, Christoph Hellwig, Jon Hawley, MPTFusionLinux,
eata.c maintainer, Luben Tuikov, mvsas maintainer,
pm8001 maintainer Jack Wang, Nicholas Bellinger
From: Nicholas Bellinger <nab@linux-iscsi.org>
This patch removes the now legacy host_lock unlock() + lock() optimization
fnic_scsi.c:fnic_queuecommand(). This also includes setting the
SHT->unlocked_qcmd=1 for host_lock less fnic fnic_queuecommand operation.
Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
---
drivers/scsi/fnic/fnic_main.c | 1 +
drivers/scsi/fnic/fnic_scsi.c | 9 ---------
2 files changed, 1 insertions(+), 9 deletions(-)
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c
index 9eb7a9e..2537814 100644
--- a/drivers/scsi/fnic/fnic_main.c
+++ b/drivers/scsi/fnic/fnic_main.c
@@ -104,6 +104,7 @@ static struct scsi_host_template fnic_host_template = {
.slave_alloc = fnic_slave_alloc,
.change_queue_depth = fc_change_queue_depth,
.change_queue_type = fc_change_queue_type,
+ .unlocked_qcmd = 1,
.this_id = -1,
.cmd_per_lun = 3,
.can_queue = FNIC_MAX_IO_REQ,
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c
index 198cbab..7cf3372 100644
--- a/drivers/scsi/fnic/fnic_scsi.c
+++ b/drivers/scsi/fnic/fnic_scsi.c
@@ -373,13 +373,6 @@ int fnic_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
if (lp->state != LPORT_ST_READY || !(lp->link_up))
return SCSI_MLQUEUE_HOST_BUSY;
- /*
- * Release host lock, use driver resource specific locks from here.
- * Don't re-enable interrupts in case they were disabled prior to the
- * caller disabling them.
- */
- spin_unlock(lp->host->host_lock);
-
/* Get a new io_req for this SCSI IO */
fnic = lport_priv(lp);
@@ -452,8 +445,6 @@ int fnic_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
}
}
out:
- /* acquire host lock before returning to SCSI */
- spin_lock(lp->host->host_lock);
return ret;
}
--
1.7.3
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2010-09-28 2:07 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-28 2:07 [RFC v4 13/19] fnic: Remove host_lock unlock() + lock() from fnic_queuecommand() Nicholas A. Bellinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).