From: Christoph Hellwig <hch@lst.de>
Date: Wed, 1 Jul 2020 08:59:37 +0000 (+0200)
Subject: dm: stop using ->queuedata
X-Git-Tag: v5.9-rc1~147^2~61
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c4a59c4e5db3;p=thirdparty%2Fkernel%2Flinux.git

dm: stop using ->queuedata

Instead of setting up the queuedata as well just use one private data
field.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index e44473fe0f487..c8d91f271c272 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1789,7 +1789,7 @@ static blk_qc_t dm_process_bio(struct mapped_device *md,
 
 static blk_qc_t dm_make_request(struct request_queue *q, struct bio *bio)
 {
-	struct mapped_device *md = q->queuedata;
+	struct mapped_device *md = bio->bi_disk->private_data;
 	blk_qc_t ret = BLK_QC_T_NONE;
 	int srcu_idx;
 	struct dm_table *map;
@@ -1995,7 +1995,6 @@ static struct mapped_device *alloc_dev(int minor)
 	md->queue = blk_alloc_queue(dm_make_request, numa_node_id);
 	if (!md->queue)
 		goto bad;
-	md->queue->queuedata = md;
 
 	md->disk = alloc_disk_node(1, md->numa_node_id);
 	if (!md->disk)