Skip to contentSkip to conversation

libata: Remove host_lock unlock() + lock() from ata_scsi_queuecmd()

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

Subsystems (2)
SCSI libata
lore
Share & tools
lore

Nicholas A. Bellinger

author
#0 lore raw

RFC v4 9/19 libata: Remove host_lock unlock() + lock() from ata_scsi_queuecmd()

From: Nicholas Bellinger <[email protected]>

This patch removes the now legacy host_lock unlock() + lock() optimization from libata-scsi.c:ata_scsi_queuecmd(). This also includes setting the of SHT->unlocked_qcmd=1 for libata ata_scsi_queuecmd().

Signed-off-by Nicholas A. Bellinger <[email protected]>
---
 drivers/ata/libata-scsi.c |    4 +---
 include/linux/libata.h    |    1 +
 2 files changed, 2 insertions(+), 3 deletions(-)
drivers/ata/libata-scsi.c +1 -3
index a89172c..acb6669 100644
@@ -3161,7 +3161,7 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,
  *	ATA and ATAPI devices appearing as SCSI devices.
  *
  *	LOCKING:
- *	Releases scsi-layer-held lock, and obtains host lock.
+ *	None
  *
  *	RETURNS:
  *	Return value from __ata_scsi_queuecmd() if @cmd can be queued,

@@ -3177,7 +3177,6 @@ int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 
 	ap = ata_shost_to_port(shost);
 
-	spin_unlock(shost->host_lock);
 	spin_lock(ap->lock);
 
 	ata_scsi_dump_cdb(ap, cmd);

@@ -3191,7 +3190,6 @@ int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *))
 	}
 
 	spin_unlock(ap->lock);
-	spin_lock(shost->host_lock);
 	return rc;
 }
include/linux/libata.h +1 -0
index 45fb296..c08a0b9 100644
@@ -1171,6 +1171,7 @@ extern struct device_attribute *ata_common_sdev_attrs[];
 	.queuecommand		= ata_scsi_queuecmd,		\
 	.can_queue		= ATA_DEF_QUEUE,		\
 	.this_id		= ATA_SHT_THIS_ID,		\
+	.unlocked_qcmd		= 1,				\
 	.cmd_per_lun		= ATA_SHT_CMD_PER_LUN,		\
 	.emulated		= ATA_SHT_EMULATED,		\
 	.use_clustering		= ATA_SHT_USE_CLUSTERING,	\
Signature · 1 line
1.7.3