summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-09 13:02:17 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 16:54:59 -0700
commit32f0c4cbe495d121c09ed14d9c84f9e1b9574415 (patch)
treebdf044b03098748b6619bb71e8090ff5b9ef7da2 /net
parent0a8891a0a419d43ea06c8ded0849f0820c6a873b (diff)
downloadlinux-32f0c4cbe495d121c09ed14d9c84f9e1b9574415.tar.bz2
[NETNS]: Don't memset() netns to zero manually
The newly created net namespace is set to 0 with memset() in setup_net(). The setup_net() is also called for the init_net_ns(), which is zeroed naturally as a global var. So remove this memset and allocate new nets with the kmem_cache_zalloc(). Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/net_namespace.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 0e0ca6d06fa5..6f71db8c4428 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -24,7 +24,7 @@ EXPORT_SYMBOL_GPL(init_net);
static struct net *net_alloc(void)
{
- return kmem_cache_alloc(net_cachep, GFP_KERNEL);
+ return kmem_cache_zalloc(net_cachep, GFP_KERNEL);
}
static void net_free(struct net *net)
@@ -90,7 +90,6 @@ static int setup_net(struct net *net)
struct pernet_operations *ops;
int error;
- memset(net, 0, sizeof(struct net));
atomic_set(&net->count, 1);
atomic_set(&net->use_count, 0);