diff options
author | Tejun Heo <tj@kernel.org> | 2009-04-22 22:05:17 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-04-28 01:37:33 -0400 |
commit | a7f557923441186a3cdbabc54f1bcacf42b63bf5 (patch) | |
tree | 48e37802174cb98be43d89eb8bc4e466f4d79a02 /block/blk-core.c | |
parent | a538cd03be6f363d039daa94199c28cfbd508455 (diff) |
block: kill blk_start_queueing()
blk_start_queueing() is identical to __blk_run_queue() except that it
doesn't check for recursion. None of the current users depends on
blk_start_queueing() running request_fn directly. Replace usages of
blk_start_queueing() with [__]blk_run_queue() and kill it.
[ Impact: removal of mostly duplicate interface function ]
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 02f53bc00e4c..8b4a0af7d69f 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -433,9 +433,7 @@ EXPORT_SYMBOL(__blk_run_queue); | |||
433 | * | 433 | * |
434 | * Description: | 434 | * Description: |
435 | * Invoke request handling on this queue, if it has pending work to do. | 435 | * Invoke request handling on this queue, if it has pending work to do. |
436 | * May be used to restart queueing when a request has completed. Also | 436 | * May be used to restart queueing when a request has completed. |
437 | * See @blk_start_queueing. | ||
438 | * | ||
439 | */ | 437 | */ |
440 | void blk_run_queue(struct request_queue *q) | 438 | void blk_run_queue(struct request_queue *q) |
441 | { | 439 | { |
@@ -895,28 +893,6 @@ struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask) | |||
895 | EXPORT_SYMBOL(blk_get_request); | 893 | EXPORT_SYMBOL(blk_get_request); |
896 | 894 | ||
897 | /** | 895 | /** |
898 | * blk_start_queueing - initiate dispatch of requests to device | ||
899 | * @q: request queue to kick into gear | ||
900 | * | ||
901 | * This is basically a helper to remove the need to know whether a queue | ||
902 | * is plugged or not if someone just wants to initiate dispatch of requests | ||
903 | * for this queue. Should be used to start queueing on a device outside | ||
904 | * of ->request_fn() context. Also see @blk_run_queue. | ||
905 | * | ||
906 | * The queue lock must be held with interrupts disabled. | ||
907 | */ | ||
908 | void blk_start_queueing(struct request_queue *q) | ||
909 | { | ||
910 | if (!blk_queue_plugged(q)) { | ||
911 | if (unlikely(blk_queue_stopped(q))) | ||
912 | return; | ||
913 | q->request_fn(q); | ||
914 | } else | ||
915 | __generic_unplug_device(q); | ||
916 | } | ||
917 | EXPORT_SYMBOL(blk_start_queueing); | ||
918 | |||
919 | /** | ||
920 | * blk_requeue_request - put a request back on queue | 896 | * blk_requeue_request - put a request back on queue |
921 | * @q: request queue where request should be inserted | 897 | * @q: request queue where request should be inserted |
922 | * @rq: request to be inserted | 898 | * @rq: request to be inserted |
@@ -984,7 +960,7 @@ void blk_insert_request(struct request_queue *q, struct request *rq, | |||
984 | 960 | ||
985 | drive_stat_acct(rq, 1); | 961 | drive_stat_acct(rq, 1); |
986 | __elv_add_request(q, rq, where, 0); | 962 | __elv_add_request(q, rq, where, 0); |
987 | blk_start_queueing(q); | 963 | __blk_run_queue(q); |
988 | spin_unlock_irqrestore(q->queue_lock, flags); | 964 | spin_unlock_irqrestore(q->queue_lock, flags); |
989 | } | 965 | } |
990 | EXPORT_SYMBOL(blk_insert_request); | 966 | EXPORT_SYMBOL(blk_insert_request); |