diff options
author | Ursula Braun <braunu@de.ibm.com> | 2008-02-07 21:06:52 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-07 21:06:52 -0500 |
commit | 435bc9dfc6927eed9465e297d7aca1217aa61956 (patch) | |
tree | f095f65b884477991faa5d44e5c4c68deb122c7c /net | |
parent | a219994bf5cca1208fb741b20ea9eb78e1711f81 (diff) |
[IUCV]: wrong irq-disabling locking at module load time
Linux may hang when running af_iucv socket programs concurrently
with a load of module netiucv. iucv_register() tries to take the
iucv_table_lock with spin_lock_irq. This conflicts with
iucv_connect() which has a need for an smp_call_function while
holding the iucv_table_lock.
Solution: use bh-disabling locking in iucv_register()
Signed-off-by: Ursula Braun <braunu@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/iucv/iucv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index f13fe8821cbd..2753b0c448f3 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c | |||
@@ -693,9 +693,9 @@ int iucv_register(struct iucv_handler *handler, int smp) | |||
693 | iucv_setmask_up(); | 693 | iucv_setmask_up(); |
694 | INIT_LIST_HEAD(&handler->paths); | 694 | INIT_LIST_HEAD(&handler->paths); |
695 | 695 | ||
696 | spin_lock_irq(&iucv_table_lock); | 696 | spin_lock_bh(&iucv_table_lock); |
697 | list_add_tail(&handler->list, &iucv_handler_list); | 697 | list_add_tail(&handler->list, &iucv_handler_list); |
698 | spin_unlock_irq(&iucv_table_lock); | 698 | spin_unlock_bh(&iucv_table_lock); |
699 | rc = 0; | 699 | rc = 0; |
700 | out_mutex: | 700 | out_mutex: |
701 | mutex_unlock(&iucv_register_mutex); | 701 | mutex_unlock(&iucv_register_mutex); |