aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2010-05-11 02:57:42 -0400
committerJens Axboe <jens.axboe@oracle.com>2010-05-11 02:57:42 -0400
commit01effb0dc1451fad55925873ffbfb88fa4eadce0 (patch)
tree40fc70111217d23bbb5453fe08214d28ed4c7713 /block
parent0f3942a39ed768c967cb71ea0e9be7fc94112713 (diff)
block: allow initialization of previously allocated request_queue
blk_init_queue() allocates the request_queue structure and then initializes it as needed (request_fn, elevator, etc). Split initialization out to blk_init_allocated_queue_node. Introduce blk_init_allocated_queue wrapper function to model existing blk_init_queue and blk_init_queue_node interfaces. Export elv_register_queue to allow a newly added elevator to be registered with sysfs. Export elv_unregister_queue for symmetry. These changes allow DM to initialize a device's request_queue with more precision. In particular, DM no longer unconditionally initializes a full request_queue (elevator et al). It only does so for a request-based DM device. Signed-off-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c18
-rw-r--r--block/elevator.c2
2 files changed, 19 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index e9a5ae25db8c..3bc5579d6f54 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -572,6 +572,22 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
572{ 572{
573 struct request_queue *q = blk_alloc_queue_node(GFP_KERNEL, node_id); 573 struct request_queue *q = blk_alloc_queue_node(GFP_KERNEL, node_id);
574 574
575 return blk_init_allocated_queue_node(q, rfn, lock, node_id);
576}
577EXPORT_SYMBOL(blk_init_queue_node);
578
579struct request_queue *
580blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
581 spinlock_t *lock)
582{
583 return blk_init_allocated_queue_node(q, rfn, lock, -1);
584}
585EXPORT_SYMBOL(blk_init_allocated_queue);
586
587struct request_queue *
588blk_init_allocated_queue_node(struct request_queue *q, request_fn_proc *rfn,
589 spinlock_t *lock, int node_id)
590{
575 if (!q) 591 if (!q)
576 return NULL; 592 return NULL;
577 593
@@ -605,7 +621,7 @@ blk_init_queue_node(request_fn_proc *rfn, spinlock_t *lock, int node_id)
605 blk_put_queue(q); 621 blk_put_queue(q);
606 return NULL; 622 return NULL;
607} 623}
608EXPORT_SYMBOL(blk_init_queue_node); 624EXPORT_SYMBOL(blk_init_allocated_queue_node);
609 625
610int blk_get_queue(struct request_queue *q) 626int blk_get_queue(struct request_queue *q)
611{ 627{
diff --git a/block/elevator.c b/block/elevator.c
index 5e734592bb40..6df2b5056b51 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -930,6 +930,7 @@ int elv_register_queue(struct request_queue *q)
930 } 930 }
931 return error; 931 return error;
932} 932}
933EXPORT_SYMBOL(elv_register_queue);
933 934
934static void __elv_unregister_queue(struct elevator_queue *e) 935static void __elv_unregister_queue(struct elevator_queue *e)
935{ 936{
@@ -942,6 +943,7 @@ void elv_unregister_queue(struct request_queue *q)
942 if (q) 943 if (q)
943 __elv_unregister_queue(q->elevator); 944 __elv_unregister_queue(q->elevator);
944} 945}
946EXPORT_SYMBOL(elv_unregister_queue);
945 947
946void elv_register(struct elevator_type *e) 948void elv_register(struct elevator_type *e)
947{ 949{