diff options
author | Tejun Heo <tj@kernel.org> | 2011-12-13 18:33:42 -0500 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2011-12-13 18:33:42 -0500 |
commit | 3d3c2379feb177a5fd55bb0ed76776dc9d4f3243 (patch) | |
tree | fafebbef8f0fb5b73ac4db24bff20dcd40b8bf12 /block/deadline-iosched.c | |
parent | 47fdd4ca96bf4b28ac4d05d7a6e382df31d3d758 (diff) |
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.c | 4 |
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 = { | |||
448 | 448 | ||
449 | static int __init deadline_init(void) | 449 | static int __init deadline_init(void) |
450 | { | 450 | { |
451 | elv_register(&iosched_deadline); | 451 | return elv_register(&iosched_deadline); |
452 | |||
453 | return 0; | ||
454 | } | 452 | } |
455 | 453 | ||
456 | static void __exit deadline_exit(void) | 454 | static void __exit deadline_exit(void) |