hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
This commit is contained in:
Denis V. Lunev 2007-12-08 00:31:44 -08:00 committed by David S. Miller
parent c17860a039
commit a2bbe6822f
3 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/ipv4/fib_hash.c
View File

@ -315,10 +315,7 @@ fn_hash_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
break; break;
} else if (!fib_detect_death(fi, order, &last_resort, } else if (!fib_detect_death(fi, order, &last_resort,
&last_idx, fn_hash_last_dflt)) { &last_idx, fn_hash_last_dflt)) {
if (res->fi) fib_result_assign(res, fi);
fib_info_put(res->fi);
res->fi = fi;
atomic_inc(&fi->fib_clntref);
fn_hash_last_dflt = order; fn_hash_last_dflt = order;
goto out; 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 (!fib_detect_death(fi, order, &last_resort, &last_idx, fn_hash_last_dflt)) {
if (res->fi) fib_result_assign(res, fi);
fib_info_put(res->fi);
res->fi = fi;
atomic_inc(&fi->fib_clntref);
fn_hash_last_dflt = order; fn_hash_last_dflt = order;
goto out; goto out;
} }
if (last_idx >= 0) { if (last_idx >= 0)
if (res->fi) fib_result_assign(res, last_resort);
fib_info_put(res->fi);
res->fi = last_resort;
if (last_resort)
atomic_inc(&last_resort->fib_clntref);
}
fn_hash_last_dflt = last_idx; fn_hash_last_dflt = last_idx;
out: out:
read_unlock(&fib_hash_lock); read_unlock(&fib_hash_lock);

10
net/ipv4/fib_lookup.h
View File

@ -38,4 +38,14 @@ extern int fib_detect_death(struct fib_info *fi, int order,
struct fib_info **last_resort, struct fib_info **last_resort,
int *last_idx, int dflt); int *last_idx, int dflt);
static inline void fib_result_assign(struct fib_result *res,
struct fib_info *fi)
{
if (res->fi != NULL)
fib_info_put(res->fi);
res->fi = fi;
if (fi != NULL)
atomic_inc(&fi->fib_clntref);
}
#endif /* _FIB_LOOKUP_H */ #endif /* _FIB_LOOKUP_H */

19
net/ipv4/fib_trie.c
View File

@ -1831,10 +1831,7 @@ fn_trie_select_default(struct fib_table *tb, const struct flowi *flp, struct fib
break; break;
} else if (!fib_detect_death(fi, order, &last_resort, } else if (!fib_detect_death(fi, order, &last_resort,
&last_idx, trie_last_dflt)) { &last_idx, trie_last_dflt)) {
if (res->fi) fib_result_assign(res, fi);
fib_info_put(res->fi);
res->fi = fi;
atomic_inc(&fi->fib_clntref);
trie_last_dflt = order; trie_last_dflt = order;
goto out; 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 (!fib_detect_death(fi, order, &last_resort, &last_idx, trie_last_dflt)) {
if (res->fi) fib_result_assign(res, fi);
fib_info_put(res->fi);
res->fi = fi;
atomic_inc(&fi->fib_clntref);
trie_last_dflt = order; trie_last_dflt = order;
goto out; goto out;
} }
if (last_idx >= 0) { if (last_idx >= 0)
if (res->fi) fib_result_assign(res, last_resort);
fib_info_put(res->fi);
res->fi = last_resort;
if (last_resort)
atomic_inc(&last_resort->fib_clntref);
}
trie_last_dflt = last_idx; trie_last_dflt = last_idx;
out:; out:;
rcu_read_unlock(); rcu_read_unlock();