diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-15 05:41:09 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-15 15:26:43 -0400 |
commit | 4b6cb5d8e3f5707d7a2e55cf7b05f1ea8bfc7a6d (patch) | |
tree | 9db94b2ba84ed823305cd45c52f652760ea7809a /net/ipv4/ip_fragment.c | |
parent | 8e7999c44ee95e1e90ac91c83557a04e2948f160 (diff) |
[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>
Diffstat (limited to 'net/ipv4/ip_fragment.c')
-rw-r--r-- | net/ipv4/ip_fragment.c | 10 |
1 files changed, 5 insertions, 5 deletions
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) | |||
155 | 155 | ||
156 | /* Destruction primitives. */ | 156 | /* Destruction primitives. */ |
157 | 157 | ||
158 | static __inline__ void ipq_put(struct ipq *ipq, int *work) | 158 | static __inline__ void ipq_put(struct ipq *ipq) |
159 | { | 159 | { |
160 | if (atomic_dec_and_test(&ipq->q.refcnt)) | 160 | if (atomic_dec_and_test(&ipq->q.refcnt)) |
161 | inet_frag_destroy(&ipq->q, &ip4_frags, work); | 161 | inet_frag_destroy(&ipq->q, &ip4_frags, NULL); |
162 | } | 162 | } |
163 | 163 | ||
164 | /* Kill ipq entry. It is not destroyed immediately, | 164 | /* Kill ipq entry. It is not destroyed immediately, |
@@ -208,7 +208,7 @@ static void ip_expire(unsigned long arg) | |||
208 | } | 208 | } |
209 | out: | 209 | out: |
210 | spin_unlock(&qp->q.lock); | 210 | spin_unlock(&qp->q.lock); |
211 | ipq_put(qp, NULL); | 211 | ipq_put(qp); |
212 | } | 212 | } |
213 | 213 | ||
214 | /* Creation primitives. */ | 214 | /* Creation primitives. */ |
@@ -238,7 +238,7 @@ static struct ipq *ip_frag_intern(struct ipq *qp_in) | |||
238 | atomic_inc(&qp->q.refcnt); | 238 | atomic_inc(&qp->q.refcnt); |
239 | write_unlock(&ip4_frags.lock); | 239 | write_unlock(&ip4_frags.lock); |
240 | qp_in->q.last_in |= COMPLETE; | 240 | qp_in->q.last_in |= COMPLETE; |
241 | ipq_put(qp_in, NULL); | 241 | ipq_put(qp_in); |
242 | return qp; | 242 | return qp; |
243 | } | 243 | } |
244 | } | 244 | } |
@@ -664,7 +664,7 @@ int ip_defrag(struct sk_buff *skb, u32 user) | |||
664 | ret = ip_frag_queue(qp, skb); | 664 | ret = ip_frag_queue(qp, skb); |
665 | 665 | ||
666 | spin_unlock(&qp->q.lock); | 666 | spin_unlock(&qp->q.lock); |
667 | ipq_put(qp, NULL); | 667 | ipq_put(qp); |
668 | return ret; | 668 | return ret; |
669 | } | 669 | } |
670 | 670 | ||