diff options
author | James Bottomley <James.Bottomley@steeleye.com> | 2007-07-16 14:15:51 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.localdomain> | 2007-07-18 12:16:22 -0400 |
commit | 9d720d82dc295521d70939c3f5edd54050730f09 (patch) | |
tree | 35bac9c79a33916e42dda1157336c2bba01f5119 /drivers/scsi/libsas/sas_expander.c | |
parent | 0f05df8b3b41bc258bdf520b72e8cf7c524048b7 (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>
Diffstat (limited to 'drivers/scsi/libsas/sas_expander.c')
-rw-r--r-- | drivers/scsi/libsas/sas_expander.c | 12 |
1 files changed, 6 insertions, 6 deletions
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) { |