Skip to contentSkip to conversation

libiscsi: Remove host_lock unlock() + lock() from iscsi_queuecommand()

RFC In review Nicholas A. Bellinger 1 participant 1 message Sep 28, 2010

Subsystems (2)
SCSI iSCSI
lore
Share & tools
lore

Nicholas A. Bellinger

author
#0 lore raw

RFC v4 2/19 libiscsi: Remove host_lock unlock() + lock() from iscsi_queuecommand()

From: Nicholas Bellinger <[email protected]>

This patch removes the now legacy host_lock unlock() + lock() optimization from libiscsi.c:iscsi_queuecommand(). This also adds SHT->unlocked_qcmd=1 to signal host_lock less operation with iscsi_queuecommand().

Signed-off-by Nicholas A. Bellinger <[email protected]>
---
 drivers/scsi/iscsi_tcp.c |    1 +
 drivers/scsi/libiscsi.c  |    4 ----
 2 files changed, 1 insertions(+), 4 deletions(-)
drivers/scsi/iscsi_tcp.c +1 -0
index fec47de..f5933dd 100644
@@ -882,6 +882,7 @@ static struct scsi_host_template iscsi_sw_tcp_sht = {
 	.target_alloc		= iscsi_target_alloc,
 	.proc_name		= "iscsi_tcp",
 	.this_id		= -1,
+	.unlocked_qcmd		= 1,
 };
 
 static struct iscsi_transport iscsi_sw_tcp_transport = {
drivers/scsi/libiscsi.c +0 -4
index 633e090..7e4134e 100644
@@ -1615,7 +1615,6 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
 
 	host = sc->device->host;
 	ihost = shost_priv(host);
-	spin_unlock(host->host_lock);
 
 	cls_session = starget_to_session(scsi_target(sc->device));
 	session = cls_session->dd_data;

@@ -1706,7 +1705,6 @@ int iscsi_queuecommand(struct scsi_cmnd *sc, void (*done)(struct scsi_cmnd *))
 
 	session->queued_cmdsn++;
 	spin_unlock(&session->lock);
-	spin_lock(host->host_lock);
 	return 0;
 
 prepd_reject:

@@ -1716,7 +1714,6 @@ reject:
 	spin_unlock(&session->lock);
 	ISCSI_DBG_SESSION(session, "cmd 0x%x rejected (%d)\n",
 			  sc->cmnd[0], reason);
-	spin_lock(host->host_lock);
 	return SCSI_MLQUEUE_TARGET_BUSY;
 
 prepd_fault:

@@ -1733,7 +1730,6 @@ fault:
 		scsi_in(sc)->resid = scsi_in(sc)->length;
 	}
 	done(sc);
-	spin_lock(host->host_lock);
 	return 0;
 }
 EXPORT_SYMBOL_GPL(iscsi_queuecommand);
Signature · 1 line
1.7.3