From: Keith Busch <kbusch@xxxxxxxxxx> These will be used by drivers later. Signed-off-by: Keith Busch <kbusch@xxxxxxxxxx> --- block/blk-mq.c | 6 +----- block/blk-mq.h | 2 -- include/linux/blk-mq.h | 7 +++++++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/block/blk-mq.c b/block/blk-mq.c index 37d8a2f4d5da8..34ac95fc43a66 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -52,11 +52,6 @@ static inline struct blk_mq_hw_ctx *blk_qc_to_hctx(struct request_queue *q, return xa_load(&q->hctx_table, qc); } -static inline blk_qc_t blk_rq_to_qc(struct request *rq) -{ - return rq->mq_hctx->queue_num; -} - /* * Check if any of the ctx, dispatch list or elevator * have pending work in this hardware queue. @@ -4744,6 +4739,7 @@ int blk_mq_poll(struct request_queue *q, blk_qc_t cookie, struct io_comp_batch * __set_current_state(TASK_RUNNING); return 0; } +EXPORT_SYMBOL_GPL(blk_mq_poll); unsigned int blk_mq_rq_cpu(struct request *rq) { diff --git a/block/blk-mq.h b/block/blk-mq.h index ef59fee62780d..92bc058fba3e5 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h @@ -31,8 +31,6 @@ struct blk_mq_ctx { } ____cacheline_aligned_in_smp; void blk_mq_submit_bio(struct bio *bio); -int blk_mq_poll(struct request_queue *q, blk_qc_t cookie, struct io_comp_batch *iob, - unsigned int flags); void blk_mq_exit_queue(struct request_queue *q); int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr); void blk_mq_wake_waiters(struct request_queue *q); diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 1dacb2c81fdda..ed10b5e380103 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -438,6 +438,11 @@ struct blk_mq_hw_ctx { struct list_head hctx_list; }; +static inline blk_qc_t blk_rq_to_qc(struct request *rq) +{ + return rq->mq_hctx->queue_num; +} + /** * struct blk_mq_queue_map - Map software queues to hardware queues * @mq_map: CPU ID to hardware queue index map. This is an array @@ -716,6 +721,8 @@ int blk_mq_alloc_sq_tag_set(struct blk_mq_tag_set *set, void blk_mq_free_tag_set(struct blk_mq_tag_set *set); void blk_mq_free_request(struct request *rq); +int blk_mq_poll(struct request_queue *q, blk_qc_t cookie, struct io_comp_batch *iob, + unsigned int flags); bool blk_mq_queue_inflight(struct request_queue *q); -- 2.34.1