From 4b6cb5d8e3f5707d7a2e55cf7b05f1ea8bfc7a6d Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Mon, 15 Oct 2007 02:41:09 -0700 Subject: [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 Signed-off-by: David S. Miller --- net/ipv4/ip_fragment.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'net/ipv4/ip_fragment.c') diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index ee6e04159627..6676600220c5 100644 --- 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; } -- cgit v1.2.3-55-g7522