forked from Minki/linux
net/ipv6: rename rt6_next to fib6_next
This slipped through the cracks in the followup set to the fib6_info flip. Rename rt6_next to fib6_next. Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David Ahern
David S. Miller
parent
2d943adf86
commit
8fb11a9a8d
@ -135,7 +135,7 @@ struct fib6_nh {
|
||||
|
||||
struct fib6_info {
|
||||
struct fib6_table *fib6_table;
|
||||
struct fib6_info __rcu *rt6_next;
|
||||
struct fib6_info __rcu *fib6_next;
|
||||
struct fib6_node __rcu *fib6_node;
|
||||
|
||||
/* Multipath routes:
|
||||
@ -192,11 +192,11 @@ struct rt6_info {
|
||||
|
||||
#define for_each_fib6_node_rt_rcu(fn) \
|
||||
for (rt = rcu_dereference((fn)->leaf); rt; \
|
||||
rt = rcu_dereference(rt->rt6_next))
|
||||
rt = rcu_dereference(rt->fib6_next))
|
||||
|
||||
#define for_each_fib6_walker_rt(w) \
|
||||
for (rt = (w)->leaf; rt; \
|
||||
rt = rcu_dereference_protected(rt->rt6_next, 1))
|
||||
rt = rcu_dereference_protected(rt->fib6_next, 1))
|
||||
|
||||
static inline struct inet6_dev *ip6_dst_idev(struct dst_entry *dst)
|
||||
{
|
||||
|
||||
@ -945,7 +945,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
|
||||
ins = &fn->leaf;
|
||||
|
||||
for (iter = leaf; iter;
|
||||
iter = rcu_dereference_protected(iter->rt6_next,
|
||||
iter = rcu_dereference_protected(iter->fib6_next,
|
||||
lockdep_is_held(&rt->fib6_table->tb6_lock))) {
|
||||
/*
|
||||
* Search for duplicates
|
||||
@ -1002,7 +1002,7 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt,
|
||||
break;
|
||||
|
||||
next_iter:
|
||||
ins = &iter->rt6_next;
|
||||
ins = &iter->fib6_next;
|
||||
}
|
||||
|
||||
if (fallback_ins && !found) {
|
||||
@ -1031,7 +1031,7 @@ next_iter:
|
||||
&sibling->fib6_siblings);
|
||||
break;
|
||||
}
|
||||
sibling = rcu_dereference_protected(sibling->rt6_next,
|
||||
sibling = rcu_dereference_protected(sibling->fib6_next,
|
||||
lockdep_is_held(&rt->fib6_table->tb6_lock));
|
||||
}
|
||||
/* For each sibling in the list, increment the counter of
|
||||
@ -1065,7 +1065,7 @@ add:
|
||||
if (err)
|
||||
return err;
|
||||
|
||||
rcu_assign_pointer(rt->rt6_next, iter);
|
||||
rcu_assign_pointer(rt->fib6_next, iter);
|
||||
atomic_inc(&rt->fib6_ref);
|
||||
rcu_assign_pointer(rt->fib6_node, fn);
|
||||
rcu_assign_pointer(*ins, rt);
|
||||
@ -1096,7 +1096,7 @@ add:
|
||||
|
||||
atomic_inc(&rt->fib6_ref);
|
||||
rcu_assign_pointer(rt->fib6_node, fn);
|
||||
rt->rt6_next = iter->rt6_next;
|
||||
rt->fib6_next = iter->fib6_next;
|
||||
rcu_assign_pointer(*ins, rt);
|
||||
if (!info->skip_notify)
|
||||
inet6_rt_notify(RTM_NEWROUTE, rt, info, NLM_F_REPLACE);
|
||||
@ -1113,14 +1113,14 @@ add:
|
||||
|
||||
if (nsiblings) {
|
||||
/* Replacing an ECMP route, remove all siblings */
|
||||
ins = &rt->rt6_next;
|
||||
ins = &rt->fib6_next;
|
||||
iter = rcu_dereference_protected(*ins,
|
||||
lockdep_is_held(&rt->fib6_table->tb6_lock));
|
||||
while (iter) {
|
||||
if (iter->fib6_metric > rt->fib6_metric)
|
||||
break;
|
||||
if (rt6_qualify_for_ecmp(iter)) {
|
||||
*ins = iter->rt6_next;
|
||||
*ins = iter->fib6_next;
|
||||
iter->fib6_node = NULL;
|
||||
fib6_purge_rt(iter, fn, info->nl_net);
|
||||
if (rcu_access_pointer(fn->rr_ptr) == iter)
|
||||
@ -1129,7 +1129,7 @@ add:
|
||||
nsiblings--;
|
||||
info->nl_net->ipv6.rt6_stats->fib_rt_entries--;
|
||||
} else {
|
||||
ins = &iter->rt6_next;
|
||||
ins = &iter->fib6_next;
|
||||
}
|
||||
iter = rcu_dereference_protected(*ins,
|
||||
lockdep_is_held(&rt->fib6_table->tb6_lock));
|
||||
@ -1712,7 +1712,7 @@ static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,
|
||||
RT6_TRACE("fib6_del_route\n");
|
||||
|
||||
/* Unlink it */
|
||||
*rtp = rt->rt6_next;
|
||||
*rtp = rt->fib6_next;
|
||||
rt->fib6_node = NULL;
|
||||
net->ipv6.rt6_stats->fib_rt_entries--;
|
||||
net->ipv6.rt6_stats->fib_discarded_routes++;
|
||||
@ -1741,7 +1741,7 @@ static void fib6_del_route(struct fib6_table *table, struct fib6_node *fn,
|
||||
FOR_WALKERS(net, w) {
|
||||
if (w->state == FWS_C && w->leaf == rt) {
|
||||
RT6_TRACE("walker %p adjusted by delroute\n", w);
|
||||
w->leaf = rcu_dereference_protected(rt->rt6_next,
|
||||
w->leaf = rcu_dereference_protected(rt->fib6_next,
|
||||
lockdep_is_held(&table->tb6_lock));
|
||||
if (!w->leaf)
|
||||
w->state = FWS_U;
|
||||
@ -1795,7 +1795,7 @@ int fib6_del(struct fib6_info *rt, struct nl_info *info)
|
||||
fib6_del_route(table, fn, rtp, info);
|
||||
return 0;
|
||||
}
|
||||
rtp_next = &cur->rt6_next;
|
||||
rtp_next = &cur->fib6_next;
|
||||
}
|
||||
return -ENOENT;
|
||||
}
|
||||
@ -2279,7 +2279,7 @@ static int ipv6_route_yield(struct fib6_walker *w)
|
||||
|
||||
do {
|
||||
iter->w.leaf = rcu_dereference_protected(
|
||||
iter->w.leaf->rt6_next,
|
||||
iter->w.leaf->fib6_next,
|
||||
lockdep_is_held(&iter->tbl->tb6_lock));
|
||||
iter->skip--;
|
||||
if (!iter->skip && iter->w.leaf)
|
||||
@ -2345,7 +2345,7 @@ static void *ipv6_route_seq_next(struct seq_file *seq, void *v, loff_t *pos)
|
||||
if (!v)
|
||||
goto iter_table;
|
||||
|
||||
n = rcu_dereference_bh(((struct fib6_info *)v)->rt6_next);
|
||||
n = rcu_dereference_bh(((struct fib6_info *)v)->fib6_next);
|
||||
if (n) {
|
||||
++*pos;
|
||||
return n;
|
||||
|
||||
@ -468,7 +468,7 @@ static inline struct fib6_info *rt6_device_match(struct net *net,
|
||||
!(rt->fib6_nh.nh_flags & RTNH_F_DEAD))
|
||||
return rt;
|
||||
|
||||
for (sprt = rt; sprt; sprt = rcu_dereference(sprt->rt6_next)) {
|
||||
for (sprt = rt; sprt; sprt = rcu_dereference(sprt->fib6_next)) {
|
||||
const struct net_device *dev = sprt->fib6_nh.nh_dev;
|
||||
|
||||
if (sprt->fib6_nh.nh_flags & RTNH_F_DEAD)
|
||||
@ -696,7 +696,7 @@ static struct fib6_info *find_rr_leaf(struct fib6_node *fn,
|
||||
|
||||
match = NULL;
|
||||
cont = NULL;
|
||||
for (rt = rr_head; rt; rt = rcu_dereference(rt->rt6_next)) {
|
||||
for (rt = rr_head; rt; rt = rcu_dereference(rt->fib6_next)) {
|
||||
if (rt->fib6_metric != metric) {
|
||||
cont = rt;
|
||||
break;
|
||||
@ -706,7 +706,7 @@ static struct fib6_info *find_rr_leaf(struct fib6_node *fn,
|
||||
}
|
||||
|
||||
for (rt = leaf; rt && rt != rr_head;
|
||||
rt = rcu_dereference(rt->rt6_next)) {
|
||||
rt = rcu_dereference(rt->fib6_next)) {
|
||||
if (rt->fib6_metric != metric) {
|
||||
cont = rt;
|
||||
break;
|
||||
@ -718,7 +718,7 @@ static struct fib6_info *find_rr_leaf(struct fib6_node *fn,
|
||||
if (match || !cont)
|
||||
return match;
|
||||
|
||||
for (rt = cont; rt; rt = rcu_dereference(rt->rt6_next))
|
||||
for (rt = cont; rt; rt = rcu_dereference(rt->fib6_next))
|
||||
match = find_match(rt, oif, strict, &mpri, match, do_rr);
|
||||
|
||||
return match;
|
||||
@ -756,7 +756,7 @@ static struct fib6_info *rt6_select(struct net *net, struct fib6_node *fn,
|
||||
&do_rr);
|
||||
|
||||
if (do_rr) {
|
||||
struct fib6_info *next = rcu_dereference(rt0->rt6_next);
|
||||
struct fib6_info *next = rcu_dereference(rt0->fib6_next);
|
||||
|
||||
/* no entries matched; do round-robin */
|
||||
if (!next || next->fib6_metric != rt0->fib6_metric)
|
||||
@ -3781,7 +3781,7 @@ static struct fib6_info *rt6_multipath_first_sibling(const struct fib6_info *rt)
|
||||
if (iter->fib6_metric == rt->fib6_metric &&
|
||||
rt6_qualify_for_ecmp(iter))
|
||||
return iter;
|
||||
iter = rcu_dereference_protected(iter->rt6_next,
|
||||
iter = rcu_dereference_protected(iter->fib6_next,
|
||||
lockdep_is_held(&rt->fib6_table->tb6_lock));
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user