diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-04 04:11:29 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-04 04:11:29 +0100 |
| commit | bbb770e7ab9a436752babfc8765e422d7481be1f (patch) | |
| tree | ed0531a408dd7889912b9c8d2db71c973f021529 | |
| parent | niu: Use pci_ioremap_bar(). (diff) | |
| download | linux-bbb770e7ab9a436752babfc8765e422d7481be1f.tar.xz linux-bbb770e7ab9a436752babfc8765e422d7481be1f.zip | |
xfrm: Fix xfrm_policy_gc_lock handling.
From: Alexey Dobriyan <adobriyan@gmail.com>
Based upon a lockdep trace by Simon Arlott.
xfrm_policy_kill() can be called from both BH and
non-BH contexts, so we have to grab xfrm_policy_gc_lock
with BH disabling.
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/xfrm/xfrm_policy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 25872747762c..058f04f54b90 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -315,9 +315,9 @@ static void xfrm_policy_kill(struct xfrm_policy *policy) return; } - spin_lock(&xfrm_policy_gc_lock); + spin_lock_bh(&xfrm_policy_gc_lock); hlist_add_head(&policy->bydst, &xfrm_policy_gc_list); - spin_unlock(&xfrm_policy_gc_lock); + spin_unlock_bh(&xfrm_policy_gc_lock); schedule_work(&xfrm_policy_gc_work); } |