diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-07-19 21:11:58 -0400 |
| commit | 20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch) | |
| tree | 415c4453d2b17a50abe7a3e515177e1fa337bd67 /security | |
| parent | 64fb98fc40738ae1a98bcea9ca3145b89fb71524 (diff) | |
mm: Remove slab destructors from kmem_cache_create().
Slab destructors were no longer supported after Christoph's
c59def9f222d44bb7e2f0a559f2906191a0862d7 change. They've been
BUGs for both slab and slub, and slob never supported them
either.
This rips out support for the dtor pointer from kmem_cache_create()
completely and fixes up every single callsite in the kernel (there were
about 224, not including the slab allocator definitions themselves,
or the documentation references).
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/key.c | 2 | ||||
| -rw-r--r-- | security/selinux/avc.c | 2 | ||||
| -rw-r--r-- | security/selinux/hooks.c | 2 | ||||
| -rw-r--r-- | security/selinux/ss/avtab.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/security/keys/key.c b/security/keys/key.c index 700400d801..01bbc6d9d1 100644 --- a/security/keys/key.c +++ b/security/keys/key.c | |||
| @@ -1001,7 +1001,7 @@ void __init key_init(void) | |||
| 1001 | { | 1001 | { |
| 1002 | /* allocate a slab in which we can store keys */ | 1002 | /* allocate a slab in which we can store keys */ |
| 1003 | key_jar = kmem_cache_create("key_jar", sizeof(struct key), | 1003 | key_jar = kmem_cache_create("key_jar", sizeof(struct key), |
| 1004 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL, NULL); | 1004 | 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); |
| 1005 | 1005 | ||
| 1006 | /* add the special key types */ | 1006 | /* add the special key types */ |
| 1007 | list_add_tail(&key_type_keyring.link, &key_types_list); | 1007 | list_add_tail(&key_type_keyring.link, &key_types_list); |
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index 78c408fd2b..ecd0673845 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
| @@ -239,7 +239,7 @@ void __init avc_init(void) | |||
| 239 | atomic_set(&avc_cache.lru_hint, 0); | 239 | atomic_set(&avc_cache.lru_hint, 0); |
| 240 | 240 | ||
| 241 | avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node), | 241 | avc_node_cachep = kmem_cache_create("avc_node", sizeof(struct avc_node), |
| 242 | 0, SLAB_PANIC, NULL, NULL); | 242 | 0, SLAB_PANIC, NULL); |
| 243 | 243 | ||
| 244 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_KERNEL, "AVC INITIALIZED\n"); | 244 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_KERNEL, "AVC INITIALIZED\n"); |
| 245 | } | 245 | } |
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 26356e6710..0fac6829c6 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -4913,7 +4913,7 @@ static __init int selinux_init(void) | |||
| 4913 | 4913 | ||
| 4914 | sel_inode_cache = kmem_cache_create("selinux_inode_security", | 4914 | sel_inode_cache = kmem_cache_create("selinux_inode_security", |
| 4915 | sizeof(struct inode_security_struct), | 4915 | sizeof(struct inode_security_struct), |
| 4916 | 0, SLAB_PANIC, NULL, NULL); | 4916 | 0, SLAB_PANIC, NULL); |
| 4917 | avc_init(); | 4917 | avc_init(); |
| 4918 | 4918 | ||
| 4919 | original_ops = secondary_ops = security_ops; | 4919 | original_ops = secondary_ops = security_ops; |
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index 3122908afd..85705eb289 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c | |||
| @@ -445,7 +445,7 @@ void avtab_cache_init(void) | |||
| 445 | { | 445 | { |
| 446 | avtab_node_cachep = kmem_cache_create("avtab_node", | 446 | avtab_node_cachep = kmem_cache_create("avtab_node", |
| 447 | sizeof(struct avtab_node), | 447 | sizeof(struct avtab_node), |
| 448 | 0, SLAB_PANIC, NULL, NULL); | 448 | 0, SLAB_PANIC, NULL); |
| 449 | } | 449 | } |
| 450 | 450 | ||
| 451 | void avtab_cache_destroy(void) | 451 | void avtab_cache_destroy(void) |
