aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blk-mq.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2014-05-28 12:11:06 -0400
committerJens Axboe <axboe@fb.com>2014-05-28 12:18:31 -0400
commitcdef54dd85ad66e77262ea57796a3e81683dd5d6 (patch)
tree55ae5b4f46a884b15879eaab19c7af72db23927b /include/linux/blk-mq.h
parent75bb4625bb78d6a2d879dcb6a7d482861295765b (diff)
blk-mq: remove alloc_hctx and free_hctx methods
There is no need for drivers to control hardware context allocation now that we do the context to node mapping in common code. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'include/linux/blk-mq.h')
-rw-r--r--include/linux/blk-mq.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index 2bd82f399128..91dfb75ce39f 100644
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -79,9 +79,6 @@ struct blk_mq_tag_set {
79 79
80typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, struct request *); 80typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, struct request *);
81typedef struct blk_mq_hw_ctx *(map_queue_fn)(struct request_queue *, const int); 81typedef struct blk_mq_hw_ctx *(map_queue_fn)(struct request_queue *, const int);
82typedef struct blk_mq_hw_ctx *(alloc_hctx_fn)(struct blk_mq_tag_set *,
83 unsigned int, int);
84typedef void (free_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);
85typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int); 82typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int);
86typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int); 83typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);
87typedef int (init_request_fn)(void *, struct request *, unsigned int, 84typedef int (init_request_fn)(void *, struct request *, unsigned int,
@@ -108,12 +105,6 @@ struct blk_mq_ops {
108 softirq_done_fn *complete; 105 softirq_done_fn *complete;
109 106
110 /* 107 /*
111 * Override for hctx allocations (should probably go)
112 */
113 alloc_hctx_fn *alloc_hctx;
114 free_hctx_fn *free_hctx;
115
116 /*
117 * Called when the block layer side of a hardware queue has been 108 * Called when the block layer side of a hardware queue has been
118 * set up, allowing the driver to allocate/init matching structures. 109 * set up, allowing the driver to allocate/init matching structures.
119 * Ditto for exit/teardown. 110 * Ditto for exit/teardown.
@@ -166,7 +157,6 @@ struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag);
166 157
167struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index); 158struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);
168struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int); 159struct blk_mq_hw_ctx *blk_mq_alloc_single_hw_queue(struct blk_mq_tag_set *, unsigned int, int);
169void blk_mq_free_single_hw_queue(struct blk_mq_hw_ctx *, unsigned int);
170 160
171void blk_mq_end_io(struct request *rq, int error); 161void blk_mq_end_io(struct request *rq, int error);
172void __blk_mq_end_io(struct request *rq, int error); 162void __blk_mq_end_io(struct request *rq, int error);