Commit 43a4b60d authored by David Ahern's avatar David Ahern Committed by David S. Miller

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: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5a0d7dcf
...@@ -2725,10 +2725,9 @@ static void __ip6_rt_update_pmtu(struct dst_entry *dst, const struct sock *sk, ...@@ -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, ...@@ -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, ...@@ -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();
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment