aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
committerPaul Mundt <lethal@linux-sh.org>2007-07-19 21:11:58 -0400
commit20c2df83d25c6a95affe6157a4c9cac4cf5ffaac (patch)
tree415c4453d2b17a50abe7a3e515177e1fa337bd67 /block
parent64fb98fc40738ae1a98bcea9ca3145b89fb71524 (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 'block')
-rw-r--r--block/bsg.c2
-rw-r--r--block/ll_rw_blk.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/block/bsg.c b/block/bsg.c
index baa04e7adf1..f2992e72b84 100644
--- a/block/bsg.c
+++ b/block/bsg.c
@@ -1043,7 +1043,7 @@ static int __init bsg_init(void)
1043 dev_t devid; 1043 dev_t devid;
1044 1044
1045 bsg_cmd_cachep = kmem_cache_create("bsg_cmd", 1045 bsg_cmd_cachep = kmem_cache_create("bsg_cmd",
1046 sizeof(struct bsg_command), 0, 0, NULL, NULL); 1046 sizeof(struct bsg_command), 0, 0, NULL);
1047 if (!bsg_cmd_cachep) { 1047 if (!bsg_cmd_cachep) {
1048 printk(KERN_ERR "bsg: failed creating slab cache\n"); 1048 printk(KERN_ERR "bsg: failed creating slab cache\n");
1049 return -ENOMEM; 1049 return -ENOMEM;
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index d7cadf30416..66056ca5e63 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -3698,13 +3698,13 @@ int __init blk_dev_init(void)
3698 panic("Failed to create kblockd\n"); 3698 panic("Failed to create kblockd\n");
3699 3699
3700 request_cachep = kmem_cache_create("blkdev_requests", 3700 request_cachep = kmem_cache_create("blkdev_requests",
3701 sizeof(struct request), 0, SLAB_PANIC, NULL, NULL); 3701 sizeof(struct request), 0, SLAB_PANIC, NULL);
3702 3702
3703 requestq_cachep = kmem_cache_create("blkdev_queue", 3703 requestq_cachep = kmem_cache_create("blkdev_queue",
3704 sizeof(request_queue_t), 0, SLAB_PANIC, NULL, NULL); 3704 sizeof(request_queue_t), 0, SLAB_PANIC, NULL);
3705 3705
3706 iocontext_cachep = kmem_cache_create("blkdev_ioc", 3706 iocontext_cachep = kmem_cache_create("blkdev_ioc",
3707 sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL); 3707 sizeof(struct io_context), 0, SLAB_PANIC, NULL);
3708 3708
3709 for_each_possible_cpu(i) 3709 for_each_possible_cpu(i)
3710 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i)); 3710 INIT_LIST_HEAD(&per_cpu(blk_cpu_done, i));