Commit 762cc408 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[INET]: Consolidate the xxx_put 



These ones use the generic data types too, so move
them in one place.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4b6cb5d8

include/net/inet_frag.h

+6 −0
Original line number Diff line number Diff line
@@ -51,4 +51,10 @@ void inet_frag_destroy(struct inet_frag_queue *q, 
				struct inet_frags *f, int *work);

int inet_frag_evictor(struct inet_frags *f);



static inline void inet_frag_put(struct inet_frag_queue *q, struct inet_frags *f)

{

	if (atomic_dec_and_test(&q->refcnt))

		inet_frag_destroy(q, f, NULL);

}



#endif

net/ipv4/ip_fragment.c

+1 −2
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ static __inline__ struct ipq *frag_alloc_queue(void) 


static __inline__ void ipq_put(struct ipq *ipq)

{

	if (atomic_dec_and_test(&ipq->q.refcnt))

		inet_frag_destroy(&ipq->q, &ip4_frags, NULL);

	inet_frag_put(&ipq->q, &ip4_frags);

}



/* Kill ipq entry. It is not destroyed immediately,

net/ipv6/netfilter/nf_conntrack_reasm.c

+1 −2
Original line number Diff line number Diff line
@@ -149,8 +149,7 @@ static inline struct nf_ct_frag6_queue *frag_alloc_queue(void) 


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, NULL);

	inet_frag_put(&fq->q, &nf_frags);

}



/* Kill fq entry. It is not destroyed immediately,

net/ipv6/reassembly.c

+1 −2
Original line number Diff line number Diff line
@@ -171,8 +171,7 @@ static inline struct frag_queue *frag_alloc_queue(void) 


static __inline__ void fq_put(struct frag_queue *fq)

{

	if (atomic_dec_and_test(&fq->q.refcnt))

		inet_frag_destroy(&fq->q, &ip6_frags, NULL);

	inet_frag_put(&fq->q, &ip6_frags);

}



/* Kill fq entry. It is not destroyed immediately,