net, xfrm: convert xfrm_state.refcnt from atomic_t to refcount_t

[karo-tx-linux.git] / include / net / xfrm.h

diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 01fa357e9a3290b2ea8da69ef513524af5a75442..f5272a275e8f3c83601e23122bc78ba1456b4cce 100644 (file)
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -13,6 +13,7 @@
 #include <linux/mutex.h>
 #include <linux/audit.h>
 #include <linux/slab.h>
+#include <linux/refcount.h>
 
 #include <net/sock.h>
 #include <net/dst.h>
@@ -137,7 +138,7 @@ struct xfrm_state {
        struct hlist_node       bysrc;
        struct hlist_node       byspi;
 
-       atomic_t                refcnt;
+       refcount_t              refcnt;
        spinlock_t              lock;
 
        struct xfrm_id          id;
@@ -837,18 +838,18 @@ void __xfrm_state_destroy(struct xfrm_state *);
 
 static inline void __xfrm_state_put(struct xfrm_state *x)
 {
-       atomic_dec(&x->refcnt);
+       refcount_dec(&x->refcnt);
 }
 
 static inline void xfrm_state_put(struct xfrm_state *x)
 {
-       if (atomic_dec_and_test(&x->refcnt))
+       if (refcount_dec_and_test(&x->refcnt))
                __xfrm_state_destroy(x);
 }
 
 static inline void xfrm_state_hold(struct xfrm_state *x)
 {
-       atomic_inc(&x->refcnt);
+       refcount_inc(&x->refcnt);
 }
 
 static inline bool addr_match(const void *token1, const void *token2,