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/ipv6/reassembly.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/ipv6/reassembly.c')
-rw-r--r-- | net/ipv6/reassembly.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c index 02e4e855b927..98d8fbd0c9e9 100644 --- a/net/ipv6/reassembly.c +++ b/net/ipv6/reassembly.c | |||
@@ -169,10 +169,10 @@ static inline struct frag_queue *frag_alloc_queue(void) | |||
169 | 169 | ||
170 | /* Destruction primitives. */ | 170 | /* Destruction primitives. */ |
171 | 171 | ||
172 | static __inline__ void fq_put(struct frag_queue *fq, int *work) | 172 | static __inline__ void fq_put(struct frag_queue *fq) |
173 | { | 173 | { |
174 | if (atomic_dec_and_test(&fq->q.refcnt)) | 174 | if (atomic_dec_and_test(&fq->q.refcnt)) |
175 | inet_frag_destroy(&fq->q, &ip6_frags, work); | 175 | inet_frag_destroy(&fq->q, &ip6_frags, NULL); |
176 | } | 176 | } |
177 | 177 | ||
178 | /* Kill fq entry. It is not destroyed immediately, | 178 | /* Kill fq entry. It is not destroyed immediately, |
@@ -228,7 +228,7 @@ out: | |||
228 | if (dev) | 228 | if (dev) |
229 | dev_put(dev); | 229 | dev_put(dev); |
230 | spin_unlock(&fq->q.lock); | 230 | spin_unlock(&fq->q.lock); |
231 | fq_put(fq, NULL); | 231 | fq_put(fq); |
232 | } | 232 | } |
233 | 233 | ||
234 | /* Creation primitives. */ | 234 | /* Creation primitives. */ |
@@ -252,7 +252,7 @@ static struct frag_queue *ip6_frag_intern(struct frag_queue *fq_in) | |||
252 | atomic_inc(&fq->q.refcnt); | 252 | atomic_inc(&fq->q.refcnt); |
253 | write_unlock(&ip6_frags.lock); | 253 | write_unlock(&ip6_frags.lock); |
254 | fq_in->q.last_in |= COMPLETE; | 254 | fq_in->q.last_in |= COMPLETE; |
255 | fq_put(fq_in, NULL); | 255 | fq_put(fq_in); |
256 | return fq; | 256 | return fq; |
257 | } | 257 | } |
258 | } | 258 | } |
@@ -677,7 +677,7 @@ static int ipv6_frag_rcv(struct sk_buff **skbp) | |||
677 | ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff); | 677 | ret = ip6_frag_queue(fq, skb, fhdr, IP6CB(skb)->nhoff); |
678 | 678 | ||
679 | spin_unlock(&fq->q.lock); | 679 | spin_unlock(&fq->q.lock); |
680 | fq_put(fq, NULL); | 680 | fq_put(fq); |
681 | return ret; | 681 | return ret; |
682 | } | 682 | } |
683 | 683 | ||