summaryrefslogtreecommitdiffstats
path: root/block/deadline-iosched.c
diff options
context:
space:
mode:
authorTejun Heo2011-12-14 00:33:42 +0100
committerJens Axboe2011-12-14 00:33:42 +0100
commit3d3c2379feb177a5fd55bb0ed76776dc9d4f3243 (patch)
treefafebbef8f0fb5b73ac4db24bff20dcd40b8bf12 /block/deadline-iosched.c
parentblock, cfq: move io_cq lookup to blk-ioc.c (diff)
downloadkernel-qcow2-linux-3d3c2379feb177a5fd55bb0ed76776dc9d4f3243.tar.gz
kernel-qcow2-linux-3d3c2379feb177a5fd55bb0ed76776dc9d4f3243.tar.xz
kernel-qcow2-linux-3d3c2379feb177a5fd55bb0ed76776dc9d4f3243.zip
block, cfq: move icq cache management to block core
Let elevators set ->icq_size and ->icq_align in elevator_type and elv_register() and elv_unregister() respectively create and destroy kmem_cache for icq. * elv_register() now can return failure. All callers updated. * icq caches are automatically named "ELVNAME_io_cq". * cfq_slab_setup/kill() are collapsed into cfq_init/exit(). * While at it, minor indentation change for iosched_cfq.elevator_name for consistency. This will help moving icq management to block core. This doesn't introduce any functional change. Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/deadline-iosched.c')
-rw-r--r--block/deadline-iosched.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index c644137d9cd6..7bf12d793fcd 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -448,9 +448,7 @@ static struct elevator_type iosched_deadline = {
static int __init deadline_init(void)
{
- elv_register(&iosched_deadline);
-
- return 0;
+ return elv_register(&iosched_deadline);
}
static void __exit deadline_exit(void)