diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2010-08-19 06:10:45 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-08-20 00:50:16 -0700 |
| commit | 49e8ab03ebcacd8e37660ffec20c0c46721a2800 (patch) | |
| tree | 78f17093ffdbf4e2cd788033f113888c472f0d7b /net/ipv4/route.c | |
| parent | qlge: pull NULL check ahead of dereference (diff) | |
| download | linux-dev-49e8ab03ebcacd8e37660ffec20c0c46721a2800.tar.xz linux-dev-49e8ab03ebcacd8e37660ffec20c0c46721a2800.zip | |
net: build_ehash_secret() and rt_bind_peer() cleanups
Now cmpxchg() is available on all arches, we can use it in
build_ehash_secret() and rt_bind_peer() instead of using spinlocks.
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
CC: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/ipv4/route.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 3f56b6e6c6aa..85a67c9d5982 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -1268,18 +1268,11 @@ skip_hashing: void rt_bind_peer(struct rtable *rt, int create) { - static DEFINE_SPINLOCK(rt_peer_lock); struct inet_peer *peer; peer = inet_getpeer(rt->rt_dst, create); - spin_lock_bh(&rt_peer_lock); - if (rt->peer == NULL) { - rt->peer = peer; - peer = NULL; - } - spin_unlock_bh(&rt_peer_lock); - if (peer) + if (peer && cmpxchg(&rt->peer, NULL, peer) != NULL) inet_putpeer(peer); } |