blk-mq: initialize mq kobjects in blk_mq_init_allocated_queue()

[mirror_ubuntu-bionic-kernel.git] / block / blk-mq.h

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 24b2256186f33fc38f7ffe9b36b6624ec0c9dd8f..ad8bfd7473ef7ebdf4142dac6a18095e91553cca 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -77,6 +77,7 @@ static inline struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *q,
 /*
  * sysfs helpers
  */
+extern void blk_mq_sysfs_init(struct request_queue *q);
 extern int blk_mq_sysfs_register(struct request_queue *q);
 extern void blk_mq_sysfs_unregister(struct request_queue *q);
 extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);
@@ -146,16 +147,6 @@ struct blk_mq_alloc_data {
        struct blk_mq_hw_ctx *hctx;
 };
 
-static inline void blk_mq_set_alloc_data(struct blk_mq_alloc_data *data,
-               struct request_queue *q, unsigned int flags,
-               struct blk_mq_ctx *ctx, struct blk_mq_hw_ctx *hctx)
-{
-       data->q = q;
-       data->flags = flags;
-       data->ctx = ctx;
-       data->hctx = hctx;
-}
-
 static inline struct blk_mq_tags *blk_mq_tags_from_data(struct blk_mq_alloc_data *data)
 {
        if (data->flags & BLK_MQ_REQ_INTERNAL)