Skip to content

Commit

Permalink
[INET]: Consolidate the xxx_put
Browse files Browse the repository at this point in the history
These ones use the generic data types too, so move
them in one place.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Oct 15, 2007
1 parent 4b6cb5d commit 762cc40
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
6 changes: 6 additions & 0 deletions include/net/inet_frag.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions net/ipv4/ip_fragment.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions net/ipv6/netfilter/nf_conntrack_reasm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions net/ipv6/reassembly.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 762cc40

Please sign in to comment.