From 0278756861f36821d43d4ba661ea3af809e6ae55 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Mon, 15 Oct 2007 02:41:56 -0700
Subject: [PATCH] --- yaml --- r: 69427 b: refs/heads/master c:
 762cc40801ad757a34527d5e548816cf3b6fc606 h: refs/heads/master i:   69425:
 672a05d32ea0f43729bdfd59633ac54b720e6fd3   69423:
 2c4c73e4ef3d77cf2bb53dab94e76593532f91bc v: v3

---
 [refs]                                        | 2 +-
 trunk/include/net/inet_frag.h                 | 6 ++++++
 trunk/net/ipv4/ip_fragment.c                  | 3 +--
 trunk/net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +--
 trunk/net/ipv6/reassembly.c                   | 3 +--
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3691d20cdb6c..2b30cb247d52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6cb5d8e3f5707d7a2e55cf7b05f1ea8bfc7a6d
+refs/heads/master: 762cc40801ad757a34527d5e548816cf3b6fc606
diff --git a/trunk/include/net/inet_frag.h b/trunk/include/net/inet_frag.h
index cf583cf7e9ef..911c2cd02941 100644
--- a/trunk/include/net/inet_frag.h
+++ b/trunk/include/net/inet_frag.h
@@ -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
diff --git a/trunk/net/ipv4/ip_fragment.c b/trunk/net/ipv4/ip_fragment.c
index 6676600220c5..3171ec0c0fa0 100644
--- a/trunk/net/ipv4/ip_fragment.c
+++ b/trunk/net/ipv4/ip_fragment.c
@@ -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,
diff --git a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
index 862d089b353b..bf6f2f09eae3 100644
--- a/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
+++ b/trunk/net/ipv6/netfilter/nf_conntrack_reasm.c
@@ -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,
diff --git a/trunk/net/ipv6/reassembly.c b/trunk/net/ipv6/reassembly.c
index 98d8fbd0c9e9..ed3c7b7912a8 100644
--- a/trunk/net/ipv6/reassembly.c
+++ b/trunk/net/ipv6/reassembly.c
@@ -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,