---

 25-akpm/drivers/block/ll_rw_blk.c |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff -puN drivers/block/ll_rw_blk.c~slabify-iocontext-request_queue-SLAB_PANIC drivers/block/ll_rw_blk.c
--- 25/drivers/block/ll_rw_blk.c~slabify-iocontext-request_queue-SLAB_PANIC	2004-05-12 21:02:33.478456408 -0700
+++ 25-akpm/drivers/block/ll_rw_blk.c	2004-05-12 21:02:33.483455648 -0700
@@ -2830,19 +2830,13 @@ int __init blk_dev_init(void)
 		panic("Failed to create kblockd\n");
 
 	request_cachep = kmem_cache_create("blkdev_requests",
-			sizeof(struct request), 0, 0, NULL, NULL);
-	if (!request_cachep)
-		panic("Can't create request pool slab cache\n");
+			sizeof(struct request), 0, SLAB_PANIC, NULL, NULL);
 
 	requestq_cachep = kmem_cache_create("blkdev_queue",
-			sizeof(request_queue_t), 0, 0, NULL, NULL);
-	if (!requestq_cachep)
-		panic("Can't create request queue slab cache\n");
+			sizeof(request_queue_t), 0, SLAB_PANIC, NULL, NULL);
 
 	iocontext_cachep = kmem_cache_create("blkdev_ioc",
-			sizeof(struct io_context), 0, 0, NULL, NULL);
-	if (!iocontext_cachep)
-		panic("Can't create io context slab cache\n");
+			sizeof(struct io_context), 0, SLAB_PANIC, NULL, NULL);
 
 	blk_max_low_pfn = max_low_pfn;
 	blk_max_pfn = max_pfn;

_