[INET]: Move common fields from frag_queues in one place.

Introduce the struct inet_frag_queue in include/net/inet_frag.h
file and place there all the common fields from three structs:

 * struct ipq in ipv4/ip_fragment.c
 * struct nf_ct_frag6_queue in nf_conntrack_reasm.c
 * struct frag_queue in ipv6/reassembly.c

After this, replace these fields on appropriate structures with
this structure instance and fix the users to use correct names
i.e. hunks like

-    atomic_dec(&fq->refcnt);
+    atomic_dec(&fq->q.refcnt);

(these occupy most of the patch)

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

4 files changed, 238 insertions, 250 deletions

diff --git a/include/net/inet_frag.h b/include/net/inet_frag.h
new file mode 100644
index 000000000000..74e9cb9b6943
--- /dev/null
+++ b/include/net/inet_frag.h
@@ -0,0 +1,21 @@
+#ifndef __NET_FRAG_H__
+#define __NET_FRAG_H__
+
+struct inet_frag_queue {
+        struct hlist_node       list;
+        struct list_head        lru_list;   /* lru list member */
+        spinlock_t              lock;
+        atomic_t                refcnt;
+        struct timer_list       timer;      /* when will this queue expire? */
+        struct sk_buff          *fragments; /* list of received fragments */
+        ktime_t                 stamp;
+        int                     len;        /* total length of orig datagram */
+        int                     meat;
+        __u8                    last_in;    /* first/last segment arrived? */
+
+#define COMPLETE                4
+#define FIRST_IN                2
+#define LAST_IN                 1
+};
+
+#endif
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 32108cf2a784..428eaa502ec2 100644
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -39,6 +39,7 @@
 #include <net/icmp.h>
 #include <net/checksum.h>
 #include <net/inetpeer.h>
+#include <net/inet_frag.h>
 #include <linux/tcp.h>
 #include <linux/udp.h>
 #include <linux/inet.h>
@@ -74,25 +75,13 @@ struct ipfrag_skb_cb
 
 /* Describe an entry in the "incomplete datagrams" queue. */
 struct ipq {
-        struct hlist_node list;
-        struct list_head lru_list;      /* lru list member                      */
+        struct inet_frag_queue q;
+
         u32             user;
         __be32          saddr;
         __be32          daddr;
         __be16          id;
         u8              protocol;
-        u8              last_in;
-#define COMPLETE                4
-#define FIRST_IN                2
-#define LAST_IN                 1
-
-        struct sk_buff  *fragments;     /* linked list of received fragments    */
-        int             len;            /* total length of original datagram    */
-        int             meat;
-        spinlock_t      lock;
-        atomic_t        refcnt;
-        struct timer_list timer;        /* when will this queue expire?         */
-        ktime_t         stamp;
         int             iif;
         unsigned int    rid;
         struct inet_peer *peer;
@@ -114,8 +103,8 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
 
 static __inline__ void __ipq_unlink(struct ipq *qp)
 {
-        hlist_del(&qp->list);
-        list_del(&qp->lru_list);
+        hlist_del(&qp->q.list);
+        list_del(&qp->q.lru_list);
         ip_frag_nqueues--;
 }
 
@@ -147,15 +136,15 @@ static void ipfrag_secret_rebuild(unsigned long dummy)
                 struct ipq *q;
                 struct hlist_node *p, *n;
 
-                hlist_for_each_entry_safe(q, p, n, &ipq_hash[i], list) {
+                hlist_for_each_entry_safe(q, p, n, &ipq_hash[i], q.list) {
                         unsigned int hval = ipqhashfn(q->id, q->saddr,
                                                       q->daddr, q->protocol);
 
                         if (hval != i) {
-                                hlist_del(&q->list);
+                                hlist_del(&q->q.list);
 
                                 /* Relink to new hash chain. */
-                                hlist_add_head(&q->list, &ipq_hash[hval]);
+                                hlist_add_head(&q->q.list, &ipq_hash[hval]);
                         }
                 }
         }
@@ -201,14 +190,14 @@ static void ip_frag_destroy(struct ipq *qp, int *work)
 {
         struct sk_buff *fp;
 
-        BUG_TRAP(qp->last_in&COMPLETE);
-        BUG_TRAP(del_timer(&qp->timer) == 0);
+        BUG_TRAP(qp->q.last_in&COMPLETE);
+        BUG_TRAP(del_timer(&qp->q.timer) == 0);
 
         if (qp->peer)
                 inet_putpeer(qp->peer);
 
         /* Release all fragment data. */
-        fp = qp->fragments;
+        fp = qp->q.fragments;
         while (fp) {
                 struct sk_buff *xp = fp->next;
 
@@ -222,7 +211,7 @@ static void ip_frag_destroy(struct ipq *qp, int *work)
 
 static __inline__ void ipq_put(struct ipq *ipq, int *work)
 {
-        if (atomic_dec_and_test(&ipq->refcnt))
+        if (atomic_dec_and_test(&ipq->q.refcnt))
                 ip_frag_destroy(ipq, work);
 }
 
@@ -231,13 +220,13 @@ static __inline__ void ipq_put(struct ipq *ipq, int *work)
  */
 static void ipq_kill(struct ipq *ipq)
 {
-        if (del_timer(&ipq->timer))
-                atomic_dec(&ipq->refcnt);
+        if (del_timer(&ipq->q.timer))
+                atomic_dec(&ipq->q.refcnt);
 
-        if (!(ipq->last_in & COMPLETE)) {
+        if (!(ipq->q.last_in & COMPLETE)) {
                 ipq_unlink(ipq);
-                atomic_dec(&ipq->refcnt);
-                ipq->last_in |= COMPLETE;
+                atomic_dec(&ipq->q.refcnt);
+                ipq->q.last_in |= COMPLETE;
         }
 }
 
@@ -261,14 +250,14 @@ static void ip_evictor(void)
                         return;
                 }
                 tmp = ipq_lru_list.next;
-                qp = list_entry(tmp, struct ipq, lru_list);
-                atomic_inc(&qp->refcnt);
+                qp = list_entry(tmp, struct ipq, q.lru_list);
+                atomic_inc(&qp->q.refcnt);
                 read_unlock(&ipfrag_lock);
 
-                spin_lock(&qp->lock);
-                if (!(qp->last_in&COMPLETE))
+                spin_lock(&qp->q.lock);
+                if (!(qp->q.last_in&COMPLETE))
                         ipq_kill(qp);
-                spin_unlock(&qp->lock);
+                spin_unlock(&qp->q.lock);
 
                 ipq_put(qp, &work);
                 IP_INC_STATS_BH(IPSTATS_MIB_REASMFAILS);
@@ -282,9 +271,9 @@ static void ip_expire(unsigned long arg)
 {
         struct ipq *qp = (struct ipq *) arg;
 
-        spin_lock(&qp->lock);
+        spin_lock(&qp->q.lock);
 
-        if (qp->last_in & COMPLETE)
+        if (qp->q.last_in & COMPLETE)
                 goto out;