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>

1 files changed, 2 insertions, 4 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index b603cbacdc58..f7a53b219ef0 100644
--- a/net/appletalk/ddp.c
+++ b/net/appletalk/ddp.c
@@ -162,8 +162,7 @@ static void atalk_destroy_timer(unsigned long data)
 {
         struct sock *sk = (struct sock *)data;
 
-        if (atomic_read(&sk->sk_wmem_alloc) ||
-            atomic_read(&sk->sk_rmem_alloc)) {
+        if (sk_has_allocations(sk)) {
                 sk->sk_timer.expires = jiffies + SOCK_DESTROY_TIME;
                 add_timer(&sk->sk_timer);
         } else
@@ -175,8 +174,7 @@ static inline void atalk_destroy_socket(struct sock *sk)
         atalk_remove_socket(sk);
         skb_queue_purge(&sk->sk_receive_queue);
 
-        if (atomic_read(&sk->sk_wmem_alloc) ||
-            atomic_read(&sk->sk_rmem_alloc)) {
+        if (sk_has_allocations(sk)) {
                 setup_timer(&sk->sk_timer, atalk_destroy_timer,
                                 (unsigned long)sk);
                 sk->sk_timer.expires    = jiffies + SOCK_DESTROY_TIME;