[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_hash.c b/net/ipv4/fib_hash.c
index 143a5213a185..86087d45c64e 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -315,10 +315,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
                                         break;
                         } else if (!fib_detect_death(fi, order, &last_resort,
                                                      &last_idx, fn_hash_last_dflt)) {
-                                if (res->fi)
-                                        fib_info_put(res->fi);
-                                res->fi = fi;
-                                atomic_inc(&fi->fib_clntref);
+                                fib_result_assign(res, fi);
                                 fn_hash_last_dflt = order;
                                 goto out;
                         }
@@ -333,21 +330,13 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
         }
 
         if (!fib_detect_death(fi, order, &last_resort, &last_idx, fn_hash_last_dflt)) {
-                if (res->fi)
-                        fib_info_put(res->fi);
-                res->fi = fi;
-                atomic_inc(&fi->fib_clntref);
+                fib_result_assign(res, fi);
                 fn_hash_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);
         fn_hash_last_dflt = last_idx;
 out:
         read_unlock(&fib_hash_lock);