summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@suse.de>2011-01-23 08:30:00 -0600
committerJeff Garzik <jgarzik@redhat.com>2011-03-02 02:36:45 -0500
commita29b5dad46ee4168c8fc18e47dabbde49790527b (patch)
tree8d0c2a11487a485ebf719cebb9af9b12423bf439 /drivers/ata
parent238c9cf9ea88bbbb9fd0f60c2cc9511c10b4585c (diff)
downloadop-kernel-dev-a29b5dad46ee4168c8fc18e47dabbde49790527b.zip
op-kernel-dev-a29b5dad46ee4168c8fc18e47dabbde49790527b.tar.gz
libata: fix locking for sas paths
For historical reasons, libsas uses the scsi host lock as the ata port lock, and libata always uses the ata host. For the old eh, this was largely irrelevant since the two locks were never mixed inside the code. However, the new eh has a case where it nests acquisition of the host lock inside the port lock (this does look rather deadlock prone). Obviously this would be an instant deadlock if the port lock were the host lock, so switch the libsas paths to use the ata host lock as well. Signed-off-by: James Bottomley <James.Bottomley@suse.de> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-scsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index e6ce765..c11675f 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3759,7 +3759,7 @@ struct ata_port *ata_sas_port_alloc(struct ata_host *host,
return NULL;
ap->port_no = 0;
- ap->lock = shost->host_lock;
+ ap->lock = &host->lock;
ap->pio_mask = port_info->pio_mask;
ap->mwdma_mask = port_info->mwdma_mask;
ap->udma_mask = port_info->udma_mask;
OpenPOWER on IntegriCloud