diff options
author | xeb@mail.ru <xeb@mail.ru> | 2012-08-24 01:07:38 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-08-30 12:31:03 -0400 |
commit | 99469c32f79a32d8481f87be0d3c66dad286f4ec (patch) | |
tree | fe937e501fe88ba696ba21669454367d6c7b9096 /net/l2tp/l2tp_core.c | |
parent | e2c53be223aca36cf93eb6a0f6bafa079e78f52b (diff) | |
download | lwn-99469c32f79a32d8481f87be0d3c66dad286f4ec.tar.gz lwn-99469c32f79a32d8481f87be0d3c66dad286f4ec.zip |
l2tp: avoid to use synchronize_rcu in tunnel free function
Avoid to use synchronize_rcu in l2tp_tunnel_free because context may be
atomic.
Signed-off-by: Dmitry Kozlov <xeb@mail.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/l2tp/l2tp_core.c')
-rw-r--r-- | net/l2tp/l2tp_core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index 393355d37b47..513cab08a986 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c @@ -1347,11 +1347,10 @@ static void l2tp_tunnel_free(struct l2tp_tunnel *tunnel) /* Remove from tunnel list */ spin_lock_bh(&pn->l2tp_tunnel_list_lock); list_del_rcu(&tunnel->list); + kfree_rcu(tunnel, rcu); spin_unlock_bh(&pn->l2tp_tunnel_list_lock); - synchronize_rcu(); atomic_dec(&l2tp_tunnel_count); - kfree(tunnel); } /* Create a socket for the tunnel, if one isn't set up by |