Merge branch 'for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[mirror_ubuntu-artful-kernel.git] / include / net / inet_frag.h

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
index 5932e6de8fc0a9681ce179eda4e6cbe5f391fe0a..6fdcd242777651aa75bb55ecfcb9fce53708fd53 100644 (file)
--- a/include/net/inet_frag.h
+++ b/include/net/inet_frag.h
@@ -50,7 +50,7 @@ struct inet_frag_queue {
        spinlock_t              lock;
        struct timer_list       timer;
        struct hlist_node       list;
-       atomic_t                refcnt;
+       refcount_t              refcnt;
        struct sk_buff          *fragments;
        struct sk_buff          *fragments_tail;
        ktime_t                 stamp;
@@ -92,7 +92,7 @@ struct inet_frags {
         */
        u32                     rnd;
        seqlock_t               rnd_seqlock;
-       int                     qsize;
+       unsigned int            qsize;
 
        unsigned int            (*hashfn)(const struct inet_frag_queue *);
        bool                    (*match)(const struct inet_frag_queue *q,
@@ -129,7 +129,7 @@ void inet_frag_maybe_warn_overflow(struct inet_frag_queue *q,
 
 static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)
 {
-       if (atomic_dec_and_test(&q->refcnt))
+       if (refcount_dec_and_test(&q->refcnt))
                inet_frag_destroy(q, f);
 }