diff options
author | Eric Dumazet <dada1@cosmosbay.com> | 2009-02-01 15:31:33 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-02-01 15:31:33 -0500 |
commit | 24dd1fa184595ff095a92de807fdf029b2632673 (patch) | |
tree | 6136ffd3f4d054acda875b07df18fd19d93647b9 /net/ipv4/inet_hashtables.c | |
parent | 5add300975cf36b1bd30c461105bb938da260f14 (diff) |
net: move bsockets outside of read only beginning of struct inet_hashinfo
And switch bsockets to atomic_t since it might be changed in parallel.
Signed-off-by: Eric Dumazet <dada1@cosmosbay.com>
Acked-by: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_hashtables.c')
-rw-r--r-- | net/ipv4/inet_hashtables.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index d7b6178bf48b..625cc5f64c94 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c | |||
@@ -62,7 +62,7 @@ void inet_bind_hash(struct sock *sk, struct inet_bind_bucket *tb, | |||
62 | { | 62 | { |
63 | struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; | 63 | struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; |
64 | 64 | ||
65 | hashinfo->bsockets++; | 65 | atomic_inc(&hashinfo->bsockets); |
66 | 66 | ||
67 | inet_sk(sk)->num = snum; | 67 | inet_sk(sk)->num = snum; |
68 | sk_add_bind_node(sk, &tb->owners); | 68 | sk_add_bind_node(sk, &tb->owners); |
@@ -81,7 +81,7 @@ static void __inet_put_port(struct sock *sk) | |||
81 | struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash]; | 81 | struct inet_bind_hashbucket *head = &hashinfo->bhash[bhash]; |
82 | struct inet_bind_bucket *tb; | 82 | struct inet_bind_bucket *tb; |
83 | 83 | ||
84 | hashinfo->bsockets--; | 84 | atomic_dec(&hashinfo->bsockets); |
85 | 85 | ||
86 | spin_lock(&head->lock); | 86 | spin_lock(&head->lock); |
87 | tb = inet_csk(sk)->icsk_bind_hash; | 87 | tb = inet_csk(sk)->icsk_bind_hash; |
@@ -532,6 +532,7 @@ void inet_hashinfo_init(struct inet_hashinfo *h) | |||
532 | { | 532 | { |
533 | int i; | 533 | int i; |
534 | 534 | ||
535 | atomic_set(&h->bsockets, 0); | ||
535 | for (i = 0; i < INET_LHTABLE_SIZE; i++) { | 536 | for (i = 0; i < INET_LHTABLE_SIZE; i++) { |
536 | spin_lock_init(&h->listening_hash[i].lock); | 537 | spin_lock_init(&h->listening_hash[i].lock); |
537 | INIT_HLIST_NULLS_HEAD(&h->listening_hash[i].head, | 538 | INIT_HLIST_NULLS_HEAD(&h->listening_hash[i].head, |