diff options
| author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-22 06:06:23 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-01-28 15:10:35 -0800 |
| commit | e5a2bb842cd9681d00d4ca963e63e4d3647e66f8 (patch) | |
| tree | b47692f3312039cb944f68f6fbeb0d10442f8056 /net/ipv4/inet_fragment.c | |
| parent | ac18e7509e7df327e30d6e073a787d922eaf211d (diff) | |
| download | op-kernel-dev-e5a2bb842cd9681d00d4ca963e63e4d3647e66f8.zip op-kernel-dev-e5a2bb842cd9681d00d4ca963e63e4d3647e66f8.tar.gz | |
[NETNS][FRAGS]: Make the nqueues counter per-namespace.
This is simple - just move the variable from struct inet_frags
to struct netns_frags and adjust the usage appropriately.
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/inet_fragment.c')
| -rw-r--r-- | net/ipv4/inet_fragment.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 158c5f6..4fec0b9 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -63,7 +63,6 @@ void inet_frags_init(struct inet_frags *f) f->rnd = (u32) ((num_physpages ^ (num_physpages>>7)) ^ (jiffies ^ (jiffies >> 6))); - f->nqueues = 0; atomic_set(&f->mem, 0); setup_timer(&f->secret_timer, inet_frag_secret_rebuild, @@ -73,6 +72,12 @@ void inet_frags_init(struct inet_frags *f) } EXPORT_SYMBOL(inet_frags_init); +void inet_frags_init_net(struct netns_frags *nf) +{ + nf->nqueues = 0; +} +EXPORT_SYMBOL(inet_frags_init_net); + void inet_frags_fini(struct inet_frags *f) { del_timer(&f->secret_timer); @@ -84,7 +89,7 @@ static inline void fq_unlink(struct inet_frag_queue *fq, struct inet_frags *f) write_lock(&f->lock); hlist_del(&fq->list); list_del(&fq->lru_list); - f->nqueues--; + fq->net->nqueues--; write_unlock(&f->lock); } @@ -206,7 +211,7 @@ static struct inet_frag_queue *inet_frag_intern(struct netns_frags *nf, atomic_inc(&qp->refcnt); hlist_add_head(&qp->list, &f->hash[hash]); list_add_tail(&qp->lru_list, &f->lru_list); - f->nqueues++; + nf->nqueues++; write_unlock(&f->lock); return qp; } |
