From c885b649a94d972e9f0c110d7e3759f4006b78b3 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Thu, 1 Nov 2007 00:46:50 -0700 Subject: [PATCH] --- yaml --- r: 72983 b: refs/heads/master c: d57a9212e00779181d8d820887dcab3e9d529194 h: refs/heads/master i: 72981: ccf8b57dd8604bdf70e8ea19b8c79f8148ab0e41 72979: 1e38f55e4c30044273e9feee6b253905d4bc40a2 72975: 8c58cdc6ddc7be93ecd73ac65e778316e629cdc1 v: v3 --- [refs] | 2 +- trunk/net/core/net_namespace.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d5e1c9b093ef..069e958d21ba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a2ee93d281d00cc6e2db1c306032a105d2c9474 +refs/heads/master: d57a9212e00779181d8d820887dcab3e9d529194 diff --git a/trunk/net/core/net_namespace.c b/trunk/net/core/net_namespace.c index a044e2d9a8f0..e9f0964ce70b 100644 --- a/trunk/net/core/net_namespace.c +++ b/trunk/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 @@ static __net_init int setup_net(struct net *net) } #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);