lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure that nsproxy_cache is initialized early enough

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-06-28 15:41:10 -04:00
parent 1ba1068186
commit 6657719390
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/nsproxy.h
View File

@@ -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)
{ {

1
kernel/fork.c
View File

@@ -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();
} }
/* /*

4
kernel/nsproxy.c
View File

@@ -271,10 +271,8 @@ out:
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);