1 files changed, 3 insertions, 6 deletions

diff --git a/net/appletalk/ddp.c b/net/appletalk/ddp.c
index b603cbacdc58..590b83963622 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;
@@ -1750,8 +1748,7 @@ static int atalk_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         switch (cmd) {
                 /* Protocol layer */
                 case TIOCOUTQ: {
-                        long amount = sk->sk_sndbuf -
-                                      atomic_read(&sk->sk_wmem_alloc);
+                        long amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
 
                         if (amount < 0)
                                 amount = 0;