[IPV4]: Unify assignment of fi to fib_result

Signed-off-by: Denis V. Lunev <den@openvz.org>
Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 15 deletions

diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index d48a9bbcf54d..c7c5c6c802df 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -1831,10 +1831,7 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
                                 break;
                 } else if (!fib_detect_death(fi, order, &last_resort,
                                              &last_idx, trie_last_dflt)) {
-                        if (res->fi)
-                                fib_info_put(res->fi);
-                        res->fi = fi;
-                        atomic_inc(&fi->fib_clntref);
+                        fib_result_assign(res, fi);
                         trie_last_dflt = order;
                         goto out;
                 }
@@ -1847,20 +1844,12 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
         }
 
         if (!fib_detect_death(fi, order, &last_resort, &last_idx, trie_last_dflt)) {
-                if (res->fi)
-                        fib_info_put(res->fi);
-                res->fi = fi;
-                atomic_inc(&fi->fib_clntref);
+                fib_result_assign(res, fi);
                 trie_last_dflt = order;
                 goto out;
         }
-        if (last_idx >= 0) {
-                if (res->fi)
-                        fib_info_put(res->fi);
-                res->fi = last_resort;
-                if (last_resort)
-                        atomic_inc(&last_resort->fib_clntref);
-        }
+        if (last_idx >= 0)
+                fib_result_assign(res, last_resort);
         trie_last_dflt = last_idx;
  out:;
         rcu_read_unlock();