Commit d57a9212 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

[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: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a2ee93d
...@@ -17,8 +17,6 @@ static DEFINE_MUTEX(net_mutex); ...@@ -17,8 +17,6 @@ static DEFINE_MUTEX(net_mutex);
LIST_HEAD(net_namespace_list); LIST_HEAD(net_namespace_list);
static struct kmem_cache *net_cachep;
struct net init_net; struct net init_net;
EXPORT_SYMBOL_GPL(init_net); EXPORT_SYMBOL_GPL(init_net);
...@@ -59,6 +57,8 @@ out_undo: ...@@ -59,6 +57,8 @@ out_undo:
} }
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
static struct kmem_cache *net_cachep;
static struct net *net_alloc(void) static struct net *net_alloc(void)
{ {
return kmem_cache_zalloc(net_cachep, GFP_KERNEL); return kmem_cache_zalloc(net_cachep, GFP_KERNEL);
...@@ -167,9 +167,11 @@ static int __init net_ns_init(void) ...@@ -167,9 +167,11 @@ static int __init net_ns_init(void)
int err; int err;
printk(KERN_INFO "net_namespace: %zd bytes\n", sizeof(struct net)); 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), net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
SMP_CACHE_BYTES, SMP_CACHE_BYTES,
SLAB_PANIC, NULL); SLAB_PANIC, NULL);
#endif
mutex_lock(&net_mutex); mutex_lock(&net_mutex);
err = setup_net(&init_net); err = setup_net(&init_net);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment