Commit 988187e8 authored by Yejune Deng's avatar Yejune Deng Committed by Pablo Neira Ayuso
Browse files

ipvs: replace atomic_add_return() 



atomic_inc_return() looks better

Signed-off-by: default avatarYejune Deng <yejune.deng@gmail.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent fd2d6bc4

net/netfilter/ipvs/ip_vs_core.c

+1 −1
Original line number Diff line number Diff line
@@ -2137,7 +2137,7 @@ ip_vs_in(struct netns_ipvs *ipvs, unsigned int hooknum, struct sk_buff *skb, int 
	if (cp->flags & IP_VS_CONN_F_ONE_PACKET)

		pkts = sysctl_sync_threshold(ipvs);

	else

		pkts = atomic_add_return(1, &cp->in_pkts);

		pkts = atomic_inc_return(&cp->in_pkts);



	if (ipvs->sync_state & IP_VS_STATE_MASTER)

		ip_vs_sync_conn(ipvs, cp, pkts);

net/netfilter/ipvs/ip_vs_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -615,7 +615,7 @@ static void ip_vs_sync_conn_v0(struct netns_ipvs *ipvs, struct ip_vs_conn *cp, 
	cp = cp->control;

	if (cp) {

		if (cp->flags & IP_VS_CONN_F_TEMPLATE)

			pkts = atomic_add_return(1, &cp->in_pkts);

			pkts = atomic_inc_return(&cp->in_pkts);

		else

			pkts = sysctl_sync_threshold(ipvs);

		ip_vs_sync_conn(ipvs, cp, pkts);
@@ -776,7 +776,7 @@ control: 
	if (!cp)

		return;

	if (cp->flags & IP_VS_CONN_F_TEMPLATE)

		pkts = atomic_add_return(1, &cp->in_pkts);

		pkts = atomic_inc_return(&cp->in_pkts);

	else

		pkts = sysctl_sync_threshold(ipvs);

	goto sloop;

CRA Git | Maintained and supported by SUSTech CRA and CCSE