diff options
| author | David S. Miller <davem@davemloft.net> | 2012-06-06 15:06:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-06-06 15:06:41 -0700 |
| commit | c1864cfb80a64933c221e33fed9611356c031944 (patch) | |
| tree | da718033bf04a78b927f10d2d63525abbbae77e9 /net/ipv4 | |
| parent | 9b97b84eb51e689b90960916e7c2f57f4790f17f (diff) | |
| parent | da2e852612967a53d17de930929574444a67fb52 (diff) | |
| download | blackbird-op-linux-c1864cfb80a64933c221e33fed9611356c031944.tar.gz blackbird-op-linux-c1864cfb80a64933c221e33fed9611356c031944.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/inetpeer.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/net/ipv4/inetpeer.c b/net/ipv4/inetpeer.c index d4d61b694fab..dfba343b2509 100644 --- a/net/ipv4/inetpeer.c +++ b/net/ipv4/inetpeer.c @@ -560,6 +560,17 @@ bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout) } EXPORT_SYMBOL(inet_peer_xrlim_allow); +static void inetpeer_inval_rcu(struct rcu_head *head) +{ + struct inet_peer *p = container_of(head, struct inet_peer, gc_rcu); + + spin_lock_bh(&gc_lock); + list_add_tail(&p->gc_list, &gc_list); + spin_unlock_bh(&gc_lock); + + schedule_delayed_work(&gc_work, gc_delay); +} + void inetpeer_invalidate_tree(int family) { struct inet_peer *old, *new, *prev; @@ -576,10 +587,7 @@ void inetpeer_invalidate_tree(int family) prev = cmpxchg(&base->root, old, new); if (prev == old) { base->total = 0; - spin_lock(&gc_lock); - list_add_tail(&prev->gc_list, &gc_list); - spin_unlock(&gc_lock); - schedule_delayed_work(&gc_work, gc_delay); + call_rcu(&prev->gc_rcu, inetpeer_inval_rcu); } out: |
