ipvs: replace atomic_add_return()
Subsystems (4)
PATCH 1/1 ipvs: replace atomic_add_return()
atomic_inc_return() looks better
Signed-off-by Yejune Deng <[email protected]>
--- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
net/netfilter/ipvs/ip_vs_core.c +1 -1
@@ -2137,7 +2137,7 @@ static int ip_vs_in_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,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
@@ -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 @@ void ip_vs_sync_conn(struct netns_ipvs *ipvs, struct ip_vs_conn *cp, int pkts)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;
Signature · 1 line
1.9.1
Hello,
Quoted 3 lines · Yejune Deng
atomic_inc_return()looks betterSigned-off-by Yejune Deng <[email protected]>
Looks good to me for -next, thanks!
Acked-by Julian Anastasov <[email protected]>
Quoted 42 lines
--- net/netfilter/ipvs/ip_vs_core.c | 2 +- net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)net/netfilter/ipvs/ip_vs_core.c +1
-1@@ -2137,7 +2137,7 @@ static int ip_vs_in_icmp_v6(struct netns_ipvs *ipvs, struct sk_buff *skb,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@@ -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 @@ void ip_vs_sync_conn(struct netns_ipvs *ipvs, struct ip_vs_conn *cp, int pkts)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;Signature · 1 line
1.9.1
Regards
--
Julian Anastasov <[email protected]>
Quoted 5 lines · Julian Anastasov
Hello,
On Mon, 16 Nov 2020, Yejune Deng wrote:
Quoted 7 lines
Quoted 3 lines
atomic_inc_return()looks betterSigned-off-by Yejune Deng <[email protected]>Looks good to me for -next, thanks!
Acked-by Julian Anastasov <[email protected]>
Applied, thanks.