aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-11-01 00:46:50 -0700
committerDavid S. Miller <davem@davemloft.net>2007-11-01 00:46:50 -0700
commitd57a9212e00779181d8d820887dcab3e9d529194 (patch)
tree7d32b51c2656301578e14caf94a03f675bd8d783 /net
parent[NET]: Mark the setup_net as __net_init (diff)
downloadlinux-dev-d57a9212e00779181d8d820887dcab3e9d529194.tar.xz
linux-dev-d57a9212e00779181d8d820887dcab3e9d529194.zip
[NET]: Hide the net_ns kmem cache
This cache is only required to create new namespaces, but we won't have them in CONFIG_NET_NS=n case. Hide it under the appropriate ifdef. 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.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index a044e2d9a8f0..e9f0964ce70b 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -17,8 +17,6 @@ static DEFINE_MUTEX(net_mutex);
LIST_HEAD(net_namespace_list);
-static struct kmem_cache *net_cachep;
-
struct net init_net;
EXPORT_SYMBOL_GPL(init_net);
@@ -59,6 +57,8 @@ out_undo:
}
#ifdef CONFIG_NET_NS
+static struct kmem_cache *net_cachep;
+
static struct net *net_alloc(void)
{
return kmem_cache_zalloc(net_cachep, GFP_KERNEL);
@@ -167,9 +167,11 @@ static int __init net_ns_init(void)
int err;
printk(KERN_INFO "net_namespace: %zd bytes\n", sizeof(struct net));
+#ifdef CONFIG_NET_NS
net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
SMP_CACHE_BYTES,
SLAB_PANIC, NULL);
+#endif
mutex_lock(&net_mutex);
err = setup_net(&init_net);