This was just a rather broken way to paper over a core block layer bug that is now fixed. This reverts commit cebbe577cb17ed9b04b50d9e6802a8bacffbadca. Signed-off-by: Christoph Hellwig <hch@xxxxxx> --- drivers/block/ublk_drv.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/drivers/block/ublk_drv.c b/drivers/block/ublk_drv.c index b633d268b90ae..4e0248ef6bec5 100644 --- a/drivers/block/ublk_drv.c +++ b/drivers/block/ublk_drv.c @@ -155,8 +155,6 @@ static DEFINE_MUTEX(ublk_ctl_mutex); static struct miscdevice ublk_misc; -static struct lock_class_key ublk_bio_compl_lkclass; - static inline bool ublk_can_use_task_work(const struct ublk_queue *ubq) { if (IS_BUILTIN(CONFIG_BLK_DEV_UBLK) && @@ -633,7 +631,7 @@ static void ublk_commit_rqs(struct blk_mq_hw_ctx *hctx) static int ublk_init_hctx(struct blk_mq_hw_ctx *hctx, void *driver_data, unsigned int hctx_idx) { - struct ublk_device *ub = driver_data; + struct ublk_device *ub = hctx->queue->queuedata; struct ublk_queue *ubq = ublk_get_queue(ub, hctx->queue_num); hctx->driver_data = ubq; @@ -1074,8 +1072,6 @@ static void ublk_cdev_rel(struct device *dev) { struct ublk_device *ub = container_of(dev, struct ublk_device, cdev_dev); - blk_mq_destroy_queue(ub->ub_queue); - put_disk(ub->ub_disk); blk_mq_free_tag_set(&ub->tag_set); @@ -1165,17 +1161,14 @@ static int ublk_add_dev(struct ublk_device *ub) if (err) goto out_deinit_queues; - ub->ub_queue = blk_mq_init_queue(&ub->tag_set); - if (IS_ERR(ub->ub_queue)) - goto out_cleanup_tags; - ub->ub_queue->queuedata = ub; - - disk = ub->ub_disk = blk_mq_alloc_disk_for_queue(ub->ub_queue, - &ublk_bio_compl_lkclass); + disk = ub->ub_disk = blk_mq_alloc_disk(&ub->tag_set, ub); if (IS_ERR(disk)) { err = PTR_ERR(disk); - goto out_free_request_queue; + goto out_cleanup_tags; } + ub->ub_queue = ub->ub_disk->queue; + + ub->ub_queue->queuedata = ub; blk_queue_logical_block_size(ub->ub_queue, bsize); blk_queue_physical_block_size(ub->ub_queue, bsize); @@ -1207,8 +1200,6 @@ static int ublk_add_dev(struct ublk_device *ub) return 0; -out_free_request_queue: - blk_mq_destroy_queue(ub->ub_queue); out_cleanup_tags: blk_mq_free_tag_set(&ub->tag_set); out_deinit_queues: -- 2.30.2