Commit 66577193 authored by Al Viro's avatar Al Viro

make sure that nsproxy_cache is initialized early enough

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 1ba10681
...@@ -68,6 +68,7 @@ void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); ...@@ -68,6 +68,7 @@ void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new);
void free_nsproxy(struct nsproxy *ns); void free_nsproxy(struct nsproxy *ns);
int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **, int unshare_nsproxy_namespaces(unsigned long, struct nsproxy **,
struct fs_struct *); struct fs_struct *);
int __init nsproxy_cache_init(void);
static inline void put_nsproxy(struct nsproxy *ns) static inline void put_nsproxy(struct nsproxy *ns)
{ {
......
...@@ -1574,6 +1574,7 @@ void __init proc_caches_init(void) ...@@ -1574,6 +1574,7 @@ void __init proc_caches_init(void)
SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL); SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NOTRACK, NULL);
vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC); vm_area_cachep = KMEM_CACHE(vm_area_struct, SLAB_PANIC);
mmap_init(); mmap_init();
nsproxy_cache_init();
} }
/* /*
......
...@@ -271,10 +271,8 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype) ...@@ -271,10 +271,8 @@ SYSCALL_DEFINE2(setns, int, fd, int, nstype)
return err; return err;
} }
static int __init nsproxy_cache_init(void) int __init nsproxy_cache_init(void)
{ {
nsproxy_cachep = KMEM_CACHE(nsproxy, SLAB_PANIC); nsproxy_cachep = KMEM_CACHE(nsproxy, SLAB_PANIC);
return 0; return 0;
} }
module_init(nsproxy_cache_init);
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