libata SCSI locking update
PATCH 1/1 libata SCSI locking update
Selfishly, I think this should go into 2.6.37 rather than 2.6.38, simply because it is so obviously better for a large number of Linux users.
But I understand if you'd rather wait for 2.6.38.
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git upstream-linus
to receive the following updates:
drivers/ata/libata-scsi.c | 21 +++++++++------------ 1 files changed, 9 insertions(+), 12 deletions(-)
Jeff Garzik (1):
[libata] remove SCSI host lock and serial number usage from ata_scsi_queuecmd
drivers/ata/libata-scsi.c +9 -12
@@ -3166,8 +3166,8 @@ static inline int __ata_scsi_queuecmd(struct scsi_cmnd *scmd,/** * ata_scsi_queuecmd - Issue SCSI cdb to libata-managed device +* @shost: SCSI host of command to be sent * @cmd: SCSI command to be sent -* @done: Completion function, called when command is complete * * In some cases, this function translates SCSI commands into * ATA taskfiles, and queues the taskfiles to be sent to
@@ -3177,42 +3177,39 @@ 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. +* ATA host lock * * RETURNS: * Return value from __ata_scsi_queuecmd() if @cmd can be queued, * 0 otherwise. */ -static int ata_scsi_queuecmd_lck (struct scsi_cmnd *cmd,void (*done)(struct scsi_cmnd *)) +int ata_scsi_queuecmd (struct Scsi_Host *shost,struct scsi_cmnd *cmd) {struct ata_port *ap;struct ata_device *dev;struct scsi_device *scsidev = cmd->device; -struct Scsi_Host *shost = scsidev->host;int rc =0 ; +unsigned long irq_flags; ap =ata_shost_to_port (shost); -spin_unlock (shost->host_lock); -spin_lock (ap->lock); +spin_lock_irqsave (ap->lock, irq_flags);ata_scsi_dump_cdb (ap, cmd); dev =ata_scsi_find_dev (ap, scsidev);if (likely (dev)) - rc =__ata_scsi_queuecmd (cmd, done, dev); + rc =__ata_scsi_queuecmd (cmd, cmd->scsi_done, dev);else { cmd->result = (DID_BAD_TARGET <<16 ); -done (cmd); + cmd->scsi_done (cmd); } -spin_unlock (ap->lock); -spin_lock (shost->host_lock); +spin_unlock_irqrestore (ap->lock, irq_flags); +return rc; } -DEF_SCSI_QCMD (ata_scsi_queuecmd) -/** * ata_scsi_simulate - simulate SCSI command on ATA device * @dev: the target device