[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>
This commit is contained in:
committed by
David S. Miller
parent
8e7999c44e
commit
4b6cb5d8e3
@@ -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;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user