diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2007-10-17 19:48:26 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-10-17 19:48:26 -0700 |
| commit | c95477090a2ace6d241c184adc3fbfcab9c61ceb (patch) | |
| tree | 78c43a301f18f4ad4486a48227a9ca45239208f3 /net/ipv4 | |
| parent | 48d60056387c37a17a46feda48613587a90535e5 (diff) | |
| download | op-kernel-dev-c95477090a2ace6d241c184adc3fbfcab9c61ceb.zip op-kernel-dev-c95477090a2ace6d241c184adc3fbfcab9c61ceb.tar.gz | |
[INET]: Consolidate frag queues freeing
Since we now allocate the queues in inet_fragment.c, we
can safely free it in the same place. The ->destructor
callback thus becomes optional for inet_frags.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/inet_fragment.c | 4 | ||||
| -rw-r--r-- | net/ipv4/ip_fragment.c | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 3ed09dd..e15e04f 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -136,7 +136,9 @@ void inet_frag_destroy(struct inet_frag_queue *q, struct inet_frags *f, *work -= f->qsize; atomic_sub(f->qsize, &f->mem); - f->destructor(q); + if (f->destructor) + f->destructor(q); + kfree(q); } EXPORT_SYMBOL(inet_frag_destroy); diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 314593b..453ae04 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c @@ -171,7 +171,6 @@ static __inline__ void ip4_frag_free(struct inet_frag_queue *q) qp = container_of(q, struct ipq, q); if (qp->peer) inet_putpeer(qp->peer); - kfree(qp); } |
