mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 06:10:56 +00:00
ipv6: have a single rcu unlock point in __ip6_rt_update_pmtu
Simplify the unlock path in __ip6_rt_update_pmtu by using a single point where rcu_read_unlock is called. Signed-off-by: David Ahern <dsahern@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5a0d7dcf85
commit
43a4b60d04
1 changed files with 6 additions and 8 deletions
|
@ -2725,10 +2725,9 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
|
||||||
|
|
||||||
rcu_read_lock();
|
rcu_read_lock();
|
||||||
res.f6i = rcu_dereference(rt6->from);
|
res.f6i = rcu_dereference(rt6->from);
|
||||||
if (!res.f6i) {
|
if (!res.f6i)
|
||||||
rcu_read_unlock();
|
goto out_unlock;
|
||||||
return;
|
|
||||||
}
|
|
||||||
res.fib6_flags = res.f6i->fib6_flags;
|
res.fib6_flags = res.f6i->fib6_flags;
|
||||||
res.fib6_type = res.f6i->fib6_type;
|
res.fib6_type = res.f6i->fib6_type;
|
||||||
|
|
||||||
|
@ -2744,10 +2743,8 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
|
||||||
/* fib6_info uses a nexthop that does not have fib6_nh
|
/* fib6_info uses a nexthop that does not have fib6_nh
|
||||||
* using the dst->dev + gw. Should be impossible.
|
* using the dst->dev + gw. Should be impossible.
|
||||||
*/
|
*/
|
||||||
if (!arg.match) {
|
if (!arg.match)
|
||||||
rcu_read_unlock();
|
goto out_unlock;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
res.nh = arg.match;
|
res.nh = arg.match;
|
||||||
} else {
|
} else {
|
||||||
|
@ -2760,6 +2757,7 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,
|
||||||
if (rt6_insert_exception(nrt6, &res))
|
if (rt6_insert_exception(nrt6, &res))
|
||||||
dst_release_immediate(&nrt6->dst);
|
dst_release_immediate(&nrt6->dst);
|
||||||
}
|
}
|
||||||
|
out_unlock:
|
||||||
rcu_read_unlock();
|
rcu_read_unlock();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue