Merge tag 'md/3.16' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / include / net / ip_vs.h

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 5679d927562be7b0225c68468a498ded903bd36a..624a8a54806d4c877cabcbefec9dd975e1204922 100644 (file)
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1204,7 +1204,7 @@ static inline bool __ip_vs_conn_get(struct ip_vs_conn *cp)
 /* put back the conn without restarting its timer */
 static inline void __ip_vs_conn_put(struct ip_vs_conn *cp)
 {
-       smp_mb__before_atomic_dec();
+       smp_mb__before_atomic();
        atomic_dec(&cp->refcnt);
 }
 void ip_vs_conn_put(struct ip_vs_conn *cp);
@@ -1408,7 +1408,7 @@ static inline void ip_vs_dest_hold(struct ip_vs_dest *dest)
 
 static inline void ip_vs_dest_put(struct ip_vs_dest *dest)
 {
-       smp_mb__before_atomic_dec();
+       smp_mb__before_atomic();
        atomic_dec(&dest->refcnt);
 }