]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ipvs: replace atomic_add_return()
authorYejune Deng <yejune.deng@gmail.com>
Mon, 16 Nov 2020 08:01:47 +0000 (16:01 +0800)
committerPablo Neira Ayuso <pablo@netfilter.org>
Sun, 22 Nov 2020 12:45:52 +0000 (13:45 +0100)
atomic_inc_return() looks better

Signed-off-by: Yejune Deng <yejune.deng@gmail.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/netfilter/ipvs/ip_vs_core.c
net/netfilter/ipvs/ip_vs_sync.c

index c0b8215ab3d47a6719cbb0d57cffb7b73326ecad..54e086c657210b9876ff8642bc3d1c9bcefe0dd4 100644 (file)
@@ -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);
index 16b48064f715eff3fe92d7ec2d01ab7f5360d57b..9d43277b8b4fec1bb3da9993c33a3605f966ae38 100644 (file)
@@ -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;