[INET]: Consolidate xxx_frag_intern

This routine checks for the existence of a given entry
in the hash table and inserts the new one if needed.

The ->equal callback is used to compare two frag_queue-s
together, but this one is temporary and will be removed
later. The netfilter code and the ipv6 one use the same
routine to compare frags.

The inet_frag_intern() always returns non-NULL pointer,
so convert the inet_frag_queue into protocol specific
one (with the container_of) without any checks.

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

2 files changed, 20 insertions, 60 deletions

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index 726fafd41961..d7dc444ec48f 100644
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -187,37 +187,10 @@ out:
 static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
                                           struct nf_ct_frag6_queue *fq_in)
 {
-        struct nf_ct_frag6_queue *fq;
-#ifdef CONFIG_SMP
-        struct hlist_node *n;
-#endif
-
-        write_lock(&nf_frags.lock);
-#ifdef CONFIG_SMP
-        hlist_for_each_entry(fq, n, &nf_frags.hash[hash], q.list) {
-                if (fq->id == fq_in->id &&
-                    ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
-                    ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
-                        atomic_inc(&fq->q.refcnt);
-                        write_unlock(&nf_frags.lock);
-                        fq_in->q.last_in |= COMPLETE;
-                        fq_put(fq_in);
-                        return fq;
-                }
-        }
-#endif
-        fq = fq_in;
+        struct inet_frag_queue *q;
 
-        if (!mod_timer(&fq->q.timer, jiffies + nf_frags_ctl.timeout))
-                atomic_inc(&fq->q.refcnt);
-
-        atomic_inc(&fq->q.refcnt);
-        hlist_add_head(&fq->q.list, &nf_frags.hash[hash]);
-        INIT_LIST_HEAD(&fq->q.lru_list);
-        list_add_tail(&fq->q.lru_list, &nf_frags.lru_list);
-        nf_frags.nqueues++;
-        write_unlock(&nf_frags.lock);
-        return fq;
+        q = inet_frag_intern(&fq_in->q, &nf_frags, hash);
+        return container_of(q, struct nf_ct_frag6_queue, q);
 }
 
 
@@ -752,6 +725,7 @@ int nf_ct_frag6_init(void)
         nf_frags.destructor = nf_frag_free;
         nf_frags.skb_free = nf_skb_free;
         nf_frags.qsize = sizeof(struct nf_ct_frag6_queue);
+        nf_frags.equal = ip6_frag_equal;
         inet_frags_init(&nf_frags);
 
         return 0;
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 0a1bf43bd489..73ea204eaa6f 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -143,6 +143,18 @@ static unsigned int ip6_hashfn(struct inet_frag_queue *q)
         return ip6qhashfn(fq->id, &fq->saddr, &fq->daddr);
 }
 
+int ip6_frag_equal(struct inet_frag_queue *q1, struct inet_frag_queue *q2)
+{
+        struct frag_queue *fq1, *fq2;
+
+        fq1 = container_of(q1, struct frag_queue, q);
+        fq2 = container_of(q2, struct frag_queue, q);
+        return (fq1->id == fq2->id &&
+                        ipv6_addr_equal(&fq2->saddr, &fq1->saddr) &&
+                        ipv6_addr_equal(&fq2->daddr, &fq1->daddr));
+}
+EXPORT_SYMBOL(ip6_frag_equal);
+
 /* Memory Tracking Functions. */
 static inline void frag_kfree_skb(struct sk_buff *skb, int *work)
 {
@@ -236,37 +248,10 @@ out:
 static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in,
                 unsigned int hash)
 {
-        struct frag_queue *fq;
-#ifdef CONFIG_SMP
-        struct hlist_node *n;
-#endif
-
-        write_lock(&ip6_frags.lock);
-#ifdef CONFIG_SMP
-        hlist_for_each_entry(fq, n, &ip6_frags.hash[hash], q.list) {
-                if (fq->id == fq_in->id &&
-                    ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
-                    ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
-                        atomic_inc(&fq->q.refcnt);
-                        write_unlock(&ip6_frags.lock);
-                        fq_in->q.last_in |= COMPLETE;
-                        fq_put(fq_in);
-                        return fq;
-                }
-        }
-#endif
-        fq = fq_in;
-
-        if (!mod_timer(&fq->q.timer, jiffies + ip6_frags_ctl.timeout))
-                atomic_inc(&fq->q.refcnt);
+        struct inet_frag_queue *q;
 
-        atomic_inc(&fq->q.refcnt);
-        hlist_add_head(&fq->q.list, &ip6_frags.hash[hash]);
-        INIT_LIST_HEAD(&fq->q.lru_list);
-        list_add_tail(&fq->q.lru_list, &ip6_frags.lru_list);
-        ip6_frags.nqueues++;
-        write_unlock(&ip6_frags.lock);
-        return fq;
+        q = inet_frag_intern(&fq_in->q, &ip6_frags, hash);
+        return container_of(q, struct frag_queue, q);
 }
 
 
@@ -699,5 +684,6 @@ void __init ipv6_frag_init(void)
         ip6_frags.destructor = ip6_frag_free;
         ip6_frags.skb_free = NULL;
         ip6_frags.qsize = sizeof(struct frag_queue);
+        ip6_frags.equal = ip6_frag_equal;
         inet_frags_init(&ip6_frags);
 }