ipv6: have a single rcu unlock point in __ip6_rt_update_pmtu
Subsystems (3)
David Ahern
maintainerPATCH 1/1 ipv6: have a single rcu unlock point in __ip6_rt_update_pmtu
From: David Ahern <[email protected]>
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 <[email protected]>
--- net/ipv6/route.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
net/ipv6/route.c +6 -8
@@ -2725,10 +2725,9 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk,rcu_read_lock (); res.f6i =rcu_dereference (rt6->from); -if (!res.f6i) { -rcu_read_unlock (); -return ; - } +if (!res.f6i) + goto out_unlock; + res.fib6_flags = res.f6i->fib6_flags; 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 * using the dst->dev + gw. Should be impossible. */ -if (!arg.match) { -rcu_read_unlock (); -return ; - } +if (!arg.match) + goto out_unlock; res.nh = arg.match; }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))dst_release_immediate (&nrt6->dst); } +out_unlock:rcu_read_unlock (); } }
Signature · 1 line
2.11.0
From: David Ahern <[email protected]>
Date: Thu, 1 Aug 2019 15:18:08 -0700
Quoted 6 lines
From: David Ahern <[email protected]>
Simplify the unlock path in
__ip6_rt_update_pmtuby using a single point wherercu_read_unlockis called.Signed-off-by David Ahern <[email protected]>
Applied.