diff options
author | Jens Axboe <axboe@fb.com> | 2015-02-10 15:31:34 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-02-10 15:31:34 -0500 |
commit | 201f201c33220f53856fd300e1990b779538d67f (patch) | |
tree | d796313180ff50da6f8978a1f1d7fd63a101e072 | |
parent | db507b3ffd9b7a1c87e732ac6e2c3a5d0babb15a (diff) |
blk-mq: make blk_mq_run_queues() static
We no longer use it outside of blk-mq.c, so we can make it static
and stop exporting it. Additionally, kill the 'async' argument, as
there's only one used of it.
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | block/blk-mq.c | 9 | ||||
-rw-r--r-- | include/linux/blk-mq.h | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/block/blk-mq.c b/block/blk-mq.c index eb8e694fda06..1e4d4599d9c5 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c | |||
@@ -33,6 +33,7 @@ static DEFINE_MUTEX(all_q_mutex); | |||
33 | static LIST_HEAD(all_q_list); | 33 | static LIST_HEAD(all_q_list); |
34 | 34 | ||
35 | static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx); | 35 | static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx); |
36 | static void blk_mq_run_queues(struct request_queue *q); | ||
36 | 37 | ||
37 | /* | 38 | /* |
38 | * Check if any of the ctx's have pending work in this hardware queue | 39 | * Check if any of the ctx's have pending work in this hardware queue |
@@ -117,7 +118,7 @@ void blk_mq_freeze_queue_start(struct request_queue *q) | |||
117 | 118 | ||
118 | if (freeze) { | 119 | if (freeze) { |
119 | percpu_ref_kill(&q->mq_usage_counter); | 120 | percpu_ref_kill(&q->mq_usage_counter); |
120 | blk_mq_run_queues(q, false); | 121 | blk_mq_run_queues(q); |
121 | } | 122 | } |
122 | } | 123 | } |
123 | EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start); | 124 | EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start); |
@@ -853,7 +854,7 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async) | |||
853 | &hctx->run_work, 0); | 854 | &hctx->run_work, 0); |
854 | } | 855 | } |
855 | 856 | ||
856 | void blk_mq_run_queues(struct request_queue *q, bool async) | 857 | static void blk_mq_run_queues(struct request_queue *q) |
857 | { | 858 | { |
858 | struct blk_mq_hw_ctx *hctx; | 859 | struct blk_mq_hw_ctx *hctx; |
859 | int i; | 860 | int i; |
@@ -864,10 +865,9 @@ void blk_mq_run_queues(struct request_queue *q, bool async) | |||
864 | test_bit(BLK_MQ_S_STOPPED, &hctx->state)) | 865 | test_bit(BLK_MQ_S_STOPPED, &hctx->state)) |
865 | continue; | 866 | continue; |
866 | 867 | ||
867 | blk_mq_run_hw_queue(hctx, async); | 868 | blk_mq_run_hw_queue(hctx, false); |
868 | } | 869 | } |
869 | } | 870 | } |
870 | EXPORT_SYMBOL(blk_mq_run_queues); | ||
871 | 871 | ||
872 | void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx) | 872 | void blk_mq_stop_hw_queue(struct blk_mq_hw_ctx *hctx) |
873 | { | 873 | { |
@@ -905,7 +905,6 @@ void blk_mq_start_hw_queues(struct request_queue *q) | |||
905 | } | 905 | } |
906 | EXPORT_SYMBOL(blk_mq_start_hw_queues); | 906 | EXPORT_SYMBOL(blk_mq_start_hw_queues); |
907 | 907 | ||
908 | |||
909 | void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async) | 908 | void blk_mq_start_stopped_hw_queues(struct request_queue *q, bool async) |
910 | { | 909 | { |
911 | struct blk_mq_hw_ctx *hctx; | 910 | struct blk_mq_hw_ctx *hctx; |
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 86b08b1a5eba..ac6c7f534de1 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h | |||
@@ -175,7 +175,6 @@ void blk_mq_free_tag_set(struct blk_mq_tag_set *set); | |||
175 | void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule); | 175 | void blk_mq_flush_plug_list(struct blk_plug *plug, bool from_schedule); |
176 | 176 | ||
177 | void blk_mq_insert_request(struct request *, bool, bool, bool); | 177 | void blk_mq_insert_request(struct request *, bool, bool, bool); |
178 | void blk_mq_run_queues(struct request_queue *q, bool async); | ||
179 | void blk_mq_free_request(struct request *rq); | 178 | void blk_mq_free_request(struct request *rq); |
180 | void blk_mq_free_hctx_request(struct blk_mq_hw_ctx *, struct request *rq); | 179 | void blk_mq_free_hctx_request(struct blk_mq_hw_ctx *, struct request *rq); |
181 | bool blk_mq_can_queue(struct blk_mq_hw_ctx *); | 180 | bool blk_mq_can_queue(struct blk_mq_hw_ctx *); |