aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@steeleye.com>2007-07-16 14:15:51 -0400
committerJames Bottomley <jejb@mulgrave.localdomain>2007-07-18 12:16:22 -0400
commit9d720d82dc295521d70939c3f5edd54050730f09 (patch)
tree35bac9c79a33916e42dda1157336c2bba01f5119
parent0f05df8b3b41bc258bdf520b72e8cf7c524048b7 (diff)
[SCSI] libsas: fix lockdep issue with ATA
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>
-rw-r--r--drivers/scsi/libsas/sas_discover.c8
-rw-r--r--drivers/scsi/libsas/sas_expander.c12
2 files changed, 10 insertions, 10 deletions
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 4d768db1b567..328a78ad6aa0 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -304,9 +304,9 @@ static int sas_get_port_device(struct asd_sas_port *port)
304 port->disc.max_level = 0; 304 port->disc.max_level = 0;
305 305
306 dev->rphy = rphy; 306 dev->rphy = rphy;
307 spin_lock(&port->dev_list_lock); 307 spin_lock_irq(&port->dev_list_lock);
308 list_add_tail(&dev->dev_list_node, &port->dev_list); 308 list_add_tail(&dev->dev_list_node, &port->dev_list);
309 spin_unlock(&port->dev_list_lock); 309 spin_unlock_irq(&port->dev_list_lock);
310 310
311 return 0; 311 return 0;
312} 312}
@@ -703,9 +703,9 @@ static void sas_discover_domain(struct work_struct *work)
703 sas_rphy_free(dev->rphy); 703 sas_rphy_free(dev->rphy);
704 dev->rphy = NULL; 704 dev->rphy = NULL;
705 705
706 spin_lock(&port->dev_list_lock); 706 spin_lock_irq(&port->dev_list_lock);
707 list_del_init(&dev->dev_list_node); 707 list_del_init(&dev->dev_list_node);
708 spin_unlock(&port->dev_list_lock); 708 spin_unlock_irq(&port->dev_list_lock);
709 709
710 kfree(dev); /* not kobject_register-ed yet */ 710 kfree(dev); /* not kobject_register-ed yet */
711 port->port_dev = NULL; 711 port->port_dev = NULL;
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index d05fc23b4d5b..969fd3eb494a 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -677,9 +677,9 @@ static struct domain_device *sas_ex_discover_end_dev(
677 677
678 child->rphy = rphy; 678 child->rphy = rphy;
679 679
680 spin_lock(&parent->port->dev_list_lock); 680 spin_lock_irq(&parent->port->dev_list_lock);
681 list_add_tail(&child->dev_list_node, &parent->port->dev_list); 681 list_add_tail(&child->dev_list_node, &parent->port->dev_list);
682 spin_unlock(&parent->port->dev_list_lock); 682 spin_unlock_irq(&parent->port->dev_list_lock);
683 683
684 res = sas_discover_sata(child); 684 res = sas_discover_sata(child);
685 if (res) { 685 if (res) {
@@ -701,9 +701,9 @@ static struct domain_device *sas_ex_discover_end_dev(
701 child->rphy = rphy; 701 child->rphy = rphy;
702 sas_fill_in_rphy(child, rphy); 702 sas_fill_in_rphy(child, rphy);
703 703
704 spin_lock(&parent->port->dev_list_lock); 704 spin_lock_irq(&parent->port->dev_list_lock);
705 list_add_tail(&child->dev_list_node, &parent->port->dev_list); 705 list_add_tail(&child->dev_list_node, &parent->port->dev_list);
706 spin_unlock(&parent->port->dev_list_lock); 706 spin_unlock_irq(&parent->port->dev_list_lock);
707 707
708 res = sas_discover_end_dev(child); 708 res = sas_discover_end_dev(child);
709 if (res) { 709 if (res) {
@@ -816,9 +816,9 @@ static struct domain_device *sas_ex_discover_expander(
816 sas_fill_in_rphy(child, rphy); 816 sas_fill_in_rphy(child, rphy);
817 sas_rphy_add(rphy); 817 sas_rphy_add(rphy);
818 818
819 spin_lock(&parent->port->dev_list_lock); 819 spin_lock_irq(&parent->port->dev_list_lock);
820 list_add_tail(&child->dev_list_node, &parent->port->dev_list); 820 list_add_tail(&child->dev_list_node, &parent->port->dev_list);
821 spin_unlock(&parent->port->dev_list_lock); 821 spin_unlock_irq(&parent->port->dev_list_lock);
822 822
823 res = sas_discover_expander(child); 823 res = sas_discover_expander(child);
824 if (res) { 824 if (res) {