[INET]: Small cleanup for xxx_put after evictor consolidation

After the evictor code is consolidated there is no need in
passing the extra pointer to the xxx_put() functions.

The only place when it made sense was the evictor code itself.

Maybe this change must got with the previous (or with the
next) patch, but I try to make them shorter as much as
possible to simplify the review (but they are still large
anyway), so this change goes in a separate patch.

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

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index ee6e041..6676600 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -155,10 +155,10 @@ static __inline__ struct ipq *frag_alloc_queue(void)
 
 /* Destruction primitives. */
 
-static __inline__ void ipq_put(struct ipq *ipq, int *work)
+static __inline__ void ipq_put(struct ipq *ipq)
 {
        if (atomic_dec_and_test(&ipq->q.refcnt))
-               inet_frag_destroy(&ipq->q, &ip4_frags, work);
+               inet_frag_destroy(&ipq->q, &ip4_frags, NULL);
 }
 
 /* Kill ipq entry. It is not destroyed immediately,
@@ -208,7 +208,7 @@ static void ip_expire(unsigned long arg)
        }
 out:
        spin_unlock(&qp->q.lock);
-       ipq_put(qp, NULL);
+       ipq_put(qp);
 }
 
 /* Creation primitives. */
@@ -238,7 +238,7 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in)
                        atomic_inc(&qp->q.refcnt);
                        write_unlock(&ip4_frags.lock);
                        qp_in->q.last_in |= COMPLETE;
-                       ipq_put(qp_in, NULL);
+                       ipq_put(qp_in);
                        return qp;
                }
        }
@@ -664,7 +664,7 @@ int ip_defrag(struct sk_buff *skb, u32 user)
                ret = ip_frag_queue(qp, skb);
 
                spin_unlock(&qp->q.lock);
-               ipq_put(qp, NULL);
+               ipq_put(qp);
                return ret;
        }
 

diff --git a/net/ipv6/netfilter/nf_conntrack_reasm.c b/net/ipv6/netfilter/nf_conntrack_reasm.c
index e4fbe5b..862d089 100644 (file)
--- a/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -147,10 +147,10 @@ static inline struct nf_ct_frag6_queue *frag_alloc_queue(void)
 
 /* Destruction primitives. */
 
-static __inline__ void fq_put(struct nf_ct_frag6_queue *fq, unsigned int *work)
+static __inline__ void fq_put(struct nf_ct_frag6_queue *fq)
 {
        if (atomic_dec_and_test(&fq->q.refcnt))
-               inet_frag_destroy(&fq->q, &nf_frags, work);
+               inet_frag_destroy(&fq->q, &nf_frags, NULL);
 }
 
 /* Kill fq entry. It is not destroyed immediately,
@@ -179,7 +179,7 @@ static void nf_ct_frag6_expire(unsigned long data)
 
 out:
        spin_unlock(&fq->q.lock);
-       fq_put(fq, NULL);
+       fq_put(fq);
 }
 
 /* Creation primitives. */
@@ -201,7 +201,7 @@ static struct nf_ct_frag6_queue *nf_ct_frag6_intern(unsigned int hash,
                        atomic_inc(&fq->q.refcnt);
                        write_unlock(&nf_frags.lock);
                        fq_in->q.last_in |= COMPLETE;
-                       fq_put(fq_in, NULL);
+                       fq_put(fq_in);
                        return fq;
                }
        }
@@ -692,7 +692,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
        if (nf_ct_frag6_queue(fq, clone, fhdr, nhoff) < 0) {
                spin_unlock(&fq->q.lock);
                pr_debug("Can't insert skb to queue\n");
-               fq_put(fq, NULL);
+               fq_put(fq);
                goto ret_orig;
        }
 
@@ -703,7 +703,7 @@ struct sk_buff *nf_ct_frag6_gather(struct sk_buff *skb)
        }
        spin_unlock(&fq->q.lock);
 
-       fq_put(fq, NULL);
+       fq_put(fq);
        return ret_skb;
 
 ret_orig:

diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index 02e4e85..98d8fbd 100644 (file)
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -169,10 +169,10 @@ static inline struct frag_queue *frag_alloc_queue(void)
 
 /* Destruction primitives. */
 
-static __inline__ void fq_put(struct frag_queue *fq, int *work)
+static __inline__ void fq_put(struct frag_queue *fq)
 {
        if (atomic_dec_and_test(&fq->q.refcnt))
-               inet_frag_destroy(&fq->q, &ip6_frags, work);
+               inet_frag_destroy(&fq->q, &ip6_frags, NULL);
 }
 
 /* Kill fq entry. It is not destroyed immediately,
@@ -228,7 +228,7 @@ out:
        if (dev)
                dev_put(dev);
        spin_unlock(&fq->q.lock);
-       fq_put(fq, NULL);
+       fq_put(fq);
 }
 
 /* Creation primitives. */
@@ -252,7 +252,7 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in)
                        atomic_inc(&fq->q.refcnt);
                        write_unlock(&ip6_frags.lock);
                        fq_in->q.last_in |= COMPLETE;
-                       fq_put(fq_in, NULL);
+                       fq_put(fq_in);
                        return fq;
                }
        }
@@ -677,7 +677,7 @@ static int ipv6_frag_rcv(struct sk_buff **skbp)
                ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff);
 
                spin_unlock(&fq->q.lock);
-               fq_put(fq, NULL);
+               fq_put(fq);
                return ret;
        }