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 /net/sunrpc | |
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 'net/sunrpc')
-rw-r--r-- | net/sunrpc/rpc_pipe.c | 2 | ||||
-rw-r--r-- | net/sunrpc/sched.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index 5b2b6fb244f2..650af064ff8d 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -867,7 +867,7 @@ int register_rpc_pipefs(void) | |||
867 | sizeof(struct rpc_inode), | 867 | sizeof(struct rpc_inode), |
868 | 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| | 868 | 0, (SLAB_HWCACHE_ALIGN|SLAB_RECLAIM_ACCOUNT| |
869 | SLAB_MEM_SPREAD), | 869 | SLAB_MEM_SPREAD), |
870 | init_once, NULL); | 870 | init_once); |
871 | if (!rpc_inode_cachep) | 871 | if (!rpc_inode_cachep) |
872 | return -ENOMEM; | 872 | return -ENOMEM; |
873 | err = register_filesystem(&rpc_pipe_fs_type); | 873 | err = register_filesystem(&rpc_pipe_fs_type); |
diff --git a/net/sunrpc/sched.c b/net/sunrpc/sched.c index 2ac43c41c3a9..b5723c262a3e 100644 --- a/net/sunrpc/sched.c +++ b/net/sunrpc/sched.c | |||
@@ -1031,13 +1031,13 @@ rpc_init_mempool(void) | |||
1031 | rpc_task_slabp = kmem_cache_create("rpc_tasks", | 1031 | rpc_task_slabp = kmem_cache_create("rpc_tasks", |
1032 | sizeof(struct rpc_task), | 1032 | sizeof(struct rpc_task), |
1033 | 0, SLAB_HWCACHE_ALIGN, | 1033 | 0, SLAB_HWCACHE_ALIGN, |
1034 | NULL, NULL); | 1034 | NULL); |
1035 | if (!rpc_task_slabp) | 1035 | if (!rpc_task_slabp) |
1036 | goto err_nomem; | 1036 | goto err_nomem; |
1037 | rpc_buffer_slabp = kmem_cache_create("rpc_buffers", | 1037 | rpc_buffer_slabp = kmem_cache_create("rpc_buffers", |
1038 | RPC_BUFFER_MAXSIZE, | 1038 | RPC_BUFFER_MAXSIZE, |
1039 | 0, SLAB_HWCACHE_ALIGN, | 1039 | 0, SLAB_HWCACHE_ALIGN, |
1040 | NULL, NULL); | 1040 | NULL); |
1041 | if (!rpc_buffer_slabp) | 1041 | if (!rpc_buffer_slabp) |
1042 | goto err_nomem; | 1042 | goto err_nomem; |
1043 | rpc_task_mempool = mempool_create_slab_pool(RPC_TASK_POOLSIZE, | 1043 | rpc_task_mempool = mempool_create_slab_pool(RPC_TASK_POOLSIZE, |