4 files changed, 20 insertions, 22 deletions

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index d1a39b1277d6..012cf5a68581 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -391,13 +391,8 @@ static inline void tnode_free(struct tnode *tn)
 static void tnode_free_safe(struct tnode *tn)
 {
         BUG_ON(IS_LEAF(tn));
-
-        if (node_parent((struct node *) tn)) {
-                tn->tnode_free = tnode_free_head;
-                tnode_free_head = tn;
-        } else {
-                tnode_free(tn);
-        }
+        tn->tnode_free = tnode_free_head;
+        tnode_free_head = tn;
 }
 
 static void tnode_free_flush(void)
@@ -1009,7 +1004,7 @@ fib_find_node(struct trie *t, u32 key)
         return NULL;
 }
 
-static struct node *trie_rebalance(struct trie *t, struct tnode *tn)
+static void trie_rebalance(struct trie *t, struct tnode *tn)
 {
         int wasfull;
         t_key cindex, key;
@@ -1033,12 +1028,13 @@ static struct node *trie_rebalance(struct trie *t, struct tnode *tn)
         }
 
         /* Handle last (top) tnode */
-        if (IS_TNODE(tn)) {
+        if (IS_TNODE(tn))
                 tn = (struct tnode *)resize(t, (struct tnode *)tn);
-                tnode_free_flush();
-        }
 
-        return (struct node *)tn;
+        rcu_assign_pointer(t->trie, (struct node *)tn);
+        tnode_free_flush();
+
+        return;
 }
 
 /* only used from updater-side */
@@ -1186,7 +1182,7 @@ static struct list_head *fib_insert_node(struct trie *t, u32 key, int plen)
 
         /* Rebalance the trie */
 
-        rcu_assign_pointer(t->trie, trie_rebalance(t, tp));
+        trie_rebalance(t, tp);
 done:
         return fa_head;
 }
@@ -1605,7 +1601,7 @@ static void trie_leaf_remove(struct trie *t, struct leaf *l)
         if (tp) {
                 t_key cindex = tkey_extract_bits(l->key, tp->pos, tp->bits);
                 put_child(t, (struct tnode *)tp, cindex, NULL);
-                rcu_assign_pointer(t->trie, trie_rebalance(t, tp));
+                trie_rebalance(t, tp);
         } else
                 rcu_assign_pointer(t->trie, NULL);
 
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
index b0b273503e2a..a706a47f4dbb 100644
--- a/net/ipv4/inet_diag.c
+++ b/net/ipv4/inet_diag.c
@@ -156,10 +156,10 @@ static int inet_csk_diag_fill(struct sock *sk,
         r->idiag_inode = sock_i_ino(sk);
 
         if (minfo) {
-                minfo->idiag_rmem = atomic_read(&sk->sk_rmem_alloc);
+                minfo->idiag_rmem = sk_rmem_alloc_get(sk);
                 minfo->idiag_wmem = sk->sk_wmem_queued;
                 minfo->idiag_fmem = sk->sk_forward_alloc;
-                minfo->idiag_tmem = atomic_read(&sk->sk_wmem_alloc);
+                minfo->idiag_tmem = sk_wmem_alloc_get(sk);
         }
 
         handler->idiag_get_info(sk, r, info);
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 3dc9171a272f..2979f14bb188 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -799,7 +799,8 @@ static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
         switch (cmd) {
                 case SIOCOUTQ: {
-                        int amount = atomic_read(&sk->sk_wmem_alloc);
+                        int amount = sk_wmem_alloc_get(sk);
+
                         return put_user(amount, (int __user *)arg);
                 }
                 case SIOCINQ: {
@@ -935,8 +936,8 @@ static void raw_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
         seq_printf(seq, "%4d: %08X:%04X %08X:%04X"
                 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d\n",
                 i, src, srcp, dest, destp, sp->sk_state,
-                atomic_read(&sp->sk_wmem_alloc),
-                atomic_read(&sp->sk_rmem_alloc),
+                sk_wmem_alloc_get(sp),
+                sk_rmem_alloc_get(sp),
                 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
                 atomic_read(&sp->sk_refcnt), sp, atomic_read(&sp->sk_drops));
 }
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 8f4158d7c9a6..80e3812837ad 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -840,7 +840,8 @@ int udp_ioctl(struct sock *sk, int cmd, unsigned long arg)
         switch (cmd) {
         case SIOCOUTQ:
         {
-                int amount = atomic_read(&sk->sk_wmem_alloc);
+                int amount = sk_wmem_alloc_get(sk);
+
                 return put_user(amount, (int __user *)arg);
         }
 
@@ -1721,8 +1722,8 @@ static void udp4_format_sock(struct sock *sp, struct seq_file *f,
         seq_printf(f, "%4d: %08X:%04X %08X:%04X"
                 " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d%n",
                 bucket, src, srcp, dest, destp, sp->sk_state,
-                atomic_read(&sp->sk_wmem_alloc),
-                atomic_read(&sp->sk_rmem_alloc),
+                sk_wmem_alloc_get(sp),
+                sk_rmem_alloc_get(sp),
                 0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
                 atomic_read(&sp->sk_refcnt), sp,
                 atomic_read(&sp->sk_drops), len);