Skip to content

Commit

Permalink
[SCSI] libsas: fix lockdep issue with ATA
Browse files Browse the repository at this point in the history 
lockdep noticed that with ATA support the port->dev_list_lock was
entangled at irq context, so it now needs to become IRQ safe

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
  • Loading branch information
James Bottomley authored and James Bottomley committed Jul 18, 2007
1 parent 0f05df8 commit 9d720d8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions drivers/scsi/libsas/sas_discover.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,9 @@ static int sas_get_port_device(struct asd_sas_port *port)
port->disc.max_level = 0;

dev->rphy = rphy;
spin_lock(&port->dev_list_lock);
spin_lock_irq(&port->dev_list_lock);
list_add_tail(&dev->dev_list_node, &port->dev_list);
spin_unlock(&port->dev_list_lock);
spin_unlock_irq(&port->dev_list_lock);

return 0;
}
Expand Down Expand Up @@ -703,9 +703,9 @@ static void sas_discover_domain(struct work_struct *work)
sas_rphy_free(dev->rphy);
dev->rphy = NULL;

spin_lock(&port->dev_list_lock);
spin_lock_irq(&port->dev_list_lock);
list_del_init(&dev->dev_list_node);
spin_unlock(&port->dev_list_lock);
spin_unlock_irq(&port->dev_list_lock);

kfree(dev); /* not kobject_register-ed yet */
port->port_dev = NULL;
Expand Down
12 changes: 6 additions & 6 deletions drivers/scsi/libsas/sas_expander.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,9 +677,9 @@ static struct domain_device *sas_ex_discover_end_dev(

child->rphy = rphy;

spin_lock(&parent->port->dev_list_lock);
spin_lock_irq(&parent->port->dev_list_lock);
list_add_tail(&child->dev_list_node, &parent->port->dev_list);
spin_unlock(&parent->port->dev_list_lock);
spin_unlock_irq(&parent->port->dev_list_lock);

res = sas_discover_sata(child);
if (res) {
Expand All @@ -701,9 +701,9 @@ static struct domain_device *sas_ex_discover_end_dev(
child->rphy = rphy;
sas_fill_in_rphy(child, rphy);

spin_lock(&parent->port->dev_list_lock);
spin_lock_irq(&parent->port->dev_list_lock);
list_add_tail(&child->dev_list_node, &parent->port->dev_list);
spin_unlock(&parent->port->dev_list_lock);
spin_unlock_irq(&parent->port->dev_list_lock);

res = sas_discover_end_dev(child);
if (res) {
Expand Down Expand Up @@ -816,9 +816,9 @@ static struct domain_device *sas_ex_discover_expander(
sas_fill_in_rphy(child, rphy);
sas_rphy_add(rphy);

spin_lock(&parent->port->dev_list_lock);
spin_lock_irq(&parent->port->dev_list_lock);
list_add_tail(&child->dev_list_node, &parent->port->dev_list);
spin_unlock(&parent->port->dev_list_lock);
spin_unlock_irq(&parent->port->dev_list_lock);

res = sas_discover_expander(child);
if (res) {
Expand Down

0 comments on commit 9d720d8

Please sign in to comment.