Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipvs: remove extra rcu lock

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

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
This commit is contained in:
Julian Anastasov 2013-03-09 23:25:05 +02:00 committed by Simon Horman
parent 0c12582fbc
commit bf93ad72cd
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/netfilter/ipvs/ip_vs_core.c
View file

@ -1394,10 +1394,8 @@ ip_vs_in_icmp(struct sk_buff *skb, int *related, unsigned int hooknum)
skb_reset_network_header(skb); skb_reset_network_header(skb);
IP_VS_DBG(12, "ICMP for IPIP %pI4->%pI4: mtu=%u\n", IP_VS_DBG(12, "ICMP for IPIP %pI4->%pI4: mtu=%u\n",
&ip_hdr(skb)->saddr, &ip_hdr(skb)->daddr, mtu); &ip_hdr(skb)->saddr, &ip_hdr(skb)->daddr, mtu);
rcu_read_lock();
ipv4_update_pmtu(skb, dev_net(skb->dev), ipv4_update_pmtu(skb, dev_net(skb->dev),
mtu, 0, 0, 0, 0); mtu, 0, 0, 0, 0);
rcu_read_unlock();
/* Client uses PMTUD? */ /* Client uses PMTUD? */
if (!(cih->frag_off & htons(IP_DF))) if (!(cih->frag_off & htons(IP_DF)))
goto ignore_ipip; goto ignore_ipip;