[PATCH] Represent dirty_*_centisecs as jiffies internally

[linux-2.6-omap-h63xx.git] / net / ipv6 / netfilter / nf_conntrack_reasm.c

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index c2c52af9e5602c4be485c5f4212c170c4e1b79a6..3e319035f82df0d6a429ad47ec88e83991038fa8 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -70,8 +70,8 @@ struct nf_ct_frag6_skb_cb
 
 struct nf_ct_frag6_queue
 {
-       struct nf_ct_frag6_queue        *next;
-       struct list_head lru_list;              /* lru list member      */
+       struct hlist_node       list;
+       struct list_head        lru_list;       /* lru list member      */
 
        __u32                   id;             /* fragment id          */
        struct in6_addr         saddr;
@@ -90,24 +90,21 @@ struct nf_ct_frag6_queue
 #define FIRST_IN               2
 #define LAST_IN                        1
        __u16                   nhoffset;
-       struct nf_ct_frag6_queue        **pprev;
 };
 
 /* Hash table. */
 
 #define FRAG6Q_HASHSZ  64
 
-static struct nf_ct_frag6_queue *nf_ct_frag6_hash[FRAG6Q_HASHSZ];
-static rwlock_t nf_ct_frag6_lock = RW_LOCK_UNLOCKED;
+static struct hlist_head nf_ct_frag6_hash[FRAG6Q_HASHSZ];
+static DEFINE_RWLOCK(nf_ct_frag6_lock);
 static u32 nf_ct_frag6_hash_rnd;
 static LIST_HEAD(nf_ct_frag6_lru_list);
 int nf_ct_frag6_nqueues = 0;
 
 static __inline__ void __fq_unlink(struct nf_ct_frag6_queue *fq)
 {
-       if (fq->next)
-               fq->next->pprev = fq->pprev;
-       *fq->pprev = fq->next;
+       hlist_del(&fq->list);
        list_del(&fq->lru_list);
        nf_ct_frag6_nqueues--;
 }
@@ -158,28 +155,18 @@ static void nf_ct_frag6_secret_rebuild(unsigned long dummy)
        get_random_bytes(&nf_ct_frag6_hash_rnd, sizeof(u32));
        for (i = 0; i < FRAG6Q_HASHSZ; i++) {
                struct nf_ct_frag6_queue *q;
+               struct hlist_node *p, *n;
 
-               q = nf_ct_frag6_hash[i];
-               while (q) {
-                       struct nf_ct_frag6_queue *next = q->next;
+               hlist_for_each_entry_safe(q, p, n, &nf_ct_frag6_hash[i], list) {
                        unsigned int hval = ip6qhashfn(q->id,
                                                       &q->saddr,
                                                       &q->daddr);
-
                        if (hval != i) {
-                               /* Unlink. */
-                               if (q->next)
-                                       q->next->pprev = q->pprev;
-                               *q->pprev = q->next;
-
+                               hlist_del(&q->list);
                                /* Relink to new hash chain. */
-                               if ((q->next = nf_ct_frag6_hash[hval]) != NULL)
-                                       q->next->pprev = &q->next;
-                               nf_ct_frag6_hash[hval] = q;
-                               q->pprev = &nf_ct_frag6_hash[hval];
+                               hlist_add_head(&q->list,
+                                              &nf_ct_frag6_hash[hval]);
                        }
-
-                       q = next;
                }
        }
        write_unlock(&nf_ct_frag6_lock);
@@ -314,18 +301,20 @@ out:
 
 /* Creation primitives. */
 
-
 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_ct_frag6_lock);
 #ifdef CONFIG_SMP
-       for (fq = nf_ct_frag6_hash[hash]; fq; fq = fq->next) {
+       hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) {
                if (fq->id == fq_in->id && 
-                   !ipv6_addr_cmp(&fq_in->saddr, &fq->saddr) &&
-                   !ipv6_addr_cmp(&fq_in->daddr, &fq->daddr)) {
+                   ipv6_addr_equal(&fq_in->saddr, &fq->saddr) &&
+                   ipv6_addr_equal(&fq_in->daddr, &fq->daddr)) {
                        atomic_inc(&fq->refcnt);
                        write_unlock(&nf_ct_frag6_lock);
                        fq_in->last_in |= COMPLETE;
@@ -340,10 +329,7 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
                atomic_inc(&fq->refcnt);
 
        atomic_inc(&fq->refcnt);
-       if ((fq->next = nf_ct_frag6_hash[hash]) != NULL)
-               fq->next->pprev = &fq->next;
-       nf_ct_frag6_hash[hash] = fq;
-       fq->pprev = &nf_ct_frag6_hash[hash];
+       hlist_add_head(&fq->list, &nf_ct_frag6_hash[hash]);
        INIT_LIST_HEAD(&fq->lru_list);
        list_add_tail(&fq->lru_list, &nf_ct_frag6_lru_list);
        nf_ct_frag6_nqueues++;
@@ -371,7 +357,7 @@ nf_ct_frag6_create(unsigned int hash, u32 id, struct in6_addr *src,                            struct
        init_timer(&fq->timer);
        fq->timer.function = nf_ct_frag6_expire;
        fq->timer.data = (long) fq;
-       fq->lock = SPIN_LOCK_UNLOCKED;
+       spin_lock_init(&fq->lock);
        atomic_set(&fq->refcnt, 1);
 
        return nf_ct_frag6_intern(hash, fq);
@@ -384,13 +370,14 @@ static __inline__ struct nf_ct_frag6_queue *
 fq_find(u32 id, struct in6_addr *src, struct in6_addr *dst)
 {
        struct nf_ct_frag6_queue *fq;
+       struct hlist_node *n;
        unsigned int hash = ip6qhashfn(id, src, dst);
 
        read_lock(&nf_ct_frag6_lock);
-       for (fq = nf_ct_frag6_hash[hash]; fq; fq = fq->next) {
+       hlist_for_each_entry(fq, n, &nf_ct_frag6_hash[hash], list) {
                if (fq->id == id && 
-                   !ipv6_addr_cmp(src, &fq->saddr) &&
-                   !ipv6_addr_cmp(dst, &fq->daddr)) {
+                   ipv6_addr_equal(src, &fq->saddr) &&
+                   ipv6_addr_equal(dst, &fq->daddr)) {
                        atomic_inc(&fq->refcnt);
                        read_unlock(&nf_ct_frag6_lock);
                        return fq;