summaryrefslogtreecommitdiff
path: root/net/l2tp
diff options
context:
space:
mode:
authorxeb@mail.ru <xeb@mail.ru>2012-08-24 01:07:38 +0000
committerDavid S. Miller <davem@davemloft.net>2012-08-30 12:31:03 -0400
commit99469c32f79a32d8481f87be0d3c66dad286f4ec (patch)
treefe937e501fe88ba696ba21669454367d6c7b9096 /net/l2tp
parente2c53be223aca36cf93eb6a0f6bafa079e78f52b (diff)
downloadlinux-3.10-99469c32f79a32d8481f87be0d3c66dad286f4ec.tar.gz
linux-3.10-99469c32f79a32d8481f87be0d3c66dad286f4ec.tar.bz2
linux-3.10-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')
-rw-r--r--net/l2tp/l2tp_core.c3
-rw-r--r--net/l2tp/l2tp_core.h1
2 files changed, 2 insertions, 2 deletions
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c
index 393355d37b4..513cab08a98 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
diff --git a/net/l2tp/l2tp_core.h b/net/l2tp/l2tp_core.h
index a38ec6cdeee..56d583e083a 100644
--- a/net/l2tp/l2tp_core.h
+++ b/net/l2tp/l2tp_core.h
@@ -163,6 +163,7 @@ struct l2tp_tunnel_cfg {
struct l2tp_tunnel {
int magic; /* Should be L2TP_TUNNEL_MAGIC */
+ struct rcu_head rcu;
rwlock_t hlist_lock; /* protect session_hlist */
struct hlist_head session_hlist[L2TP_HASH_SIZE];
/* hashed list of sessions,