1 files changed, 5 insertions, 5 deletions

diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c
index 877a7f65f707..6bd8e93869ed 100644
--- a/net/rose/af_rose.c
+++ b/net/rose/af_rose.c
@@ -356,8 +356,7 @@ void rose_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 */
                 setup_timer(&sk->sk_timer, rose_destroy_timer,
                                 (unsigned long)sk);
@@ -1310,7 +1309,8 @@ static int rose_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
         switch (cmd) {
         case TIOCOUTQ: {
                 long amount;
-                amount = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc);
+
+                amount = sk->sk_sndbuf - sk_wmem_alloc_get(sk);
                 if (amount < 0)
                         amount = 0;
                 return put_user(amount, (unsigned int __user *) argp);
@@ -1481,8 +1481,8 @@ static int rose_info_show(struct seq_file *seq, void *v)
                         rose->hb / HZ,
                         ax25_display_timer(&rose->idletimer) / (60 * HZ),
                         rose->idle / (60 * HZ),
-                        atomic_read(&s->sk_wmem_alloc),
-                        atomic_read(&s->sk_rmem_alloc),
+                        sk_wmem_alloc_get(s),
+                        sk_rmem_alloc_get(s),
                         s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
         }