diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-06-16 10:12:03 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-17 04:31:25 -0700 |
| commit | c564039fd83ea16a86a96d52632794b24849e507 (patch) | |
| tree | 42c9f525d08ea2e7d36c0231cc628587a175a39b /net/netrom/af_netrom.c | |
| parent | 1d4ac5d5ef9dd965ae211ebe8acbf83dc4d9571b (diff) | |
| download | kernel_samsung_tuna-c564039fd83ea16a86a96d52632794b24849e507.zip kernel_samsung_tuna-c564039fd83ea16a86a96d52632794b24849e507.tar.gz kernel_samsung_tuna-c564039fd83ea16a86a96d52632794b24849e507.tar.bz2 | |
net: sk_wmem_alloc has initial value of one, not zero
commit 2b85a34e911bf483c27cfdd124aeb1605145dc80
(net: No more expensive sock_hold()/sock_put() on each tx)
changed initial sk_wmem_alloc value.
Some protocols check sk_wmem_alloc value to determine if a timer
must delay socket deallocation. We must take care of the sk_wmem_alloc
value being one instead of zero when no write allocations are pending.
Reported by Ingo Molnar, and full diagnostic from David Miller.
This patch introduces three helpers to get read/write allocations
and a followup patch will use these helpers to report correct
write allocations to user.
Reported-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netrom/af_netrom.c')
| -rw-r--r-- | net/netrom/af_netrom.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 3be0e01..cd91190 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c @@ -286,8 +286,7 @@ void nr_destroy_socket(struct sock *sk) kfree_skb(skb); } - if (atomic_read(&sk->sk_wmem_alloc) || - atomic_read(&sk->sk_rmem_alloc)) { + if (sk_has_allocations(sk)) { /* Defer: outstanding buffers */ sk->sk_timer.function = nr_destroy_timer; sk->sk_timer.expires = jiffies + 2 * HZ; |