Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf93ad72 authored by Julian Anastasov's avatar Julian Anastasov Committed by Simon Horman
Browse files

ipvs: remove extra rcu lock 



In 3.7 we added code that uses ipv4_update_pmtu but after commit
c5ae7d41 (ipv4: must use rcu protection while calling fib_lookup)
the RCU lock is not needed.

Signed-off-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent 0c12582f

net/netfilter/ipvs/ip_vs_core.c

+0 −2
Original line number Diff line number Diff line
@@ -1394,10 +1394,8 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum) 
			skb_reset_network_header(skb);

			IP_VS_DBG(12, "ICMP for IPIP %pI4->%pI4: mtu=%u\n",

				&ip_hdr(skb)->saddr, &ip_hdr(skb)->daddr, mtu);

			rcu_read_lock();

			ipv4_update_pmtu(skb, dev_net(skb->dev),

					 mtu, 0, 0, 0, 0);

			rcu_read_unlock();

			/* Client uses PMTUD? */

			if (!(cih->frag_off & htons(IP_DF)))

				goto ignore_ipip;