Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
nvme-multipath: stop using ->queuedata
nvme-multipath already uses the gendisk private data, not need to
also set up the request_queue queuedata and use it in one place only.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
authored by
Christoph Hellwig
and committed by
Jens Axboe
7890b970
db5ad6b7
+1
-2
+1
-2
drivers/nvme/host/multipath.c
+1
-2
drivers/nvme/host/multipath.c
···
294
294
static blk_qc_t nvme_ns_head_make_request(struct request_queue *q,
295
295
struct bio *bio)
296
296
{
297
-
struct nvme_ns_head *head = q->queuedata;
297
+
struct nvme_ns_head *head = bio->bi_disk->private_data;
298
298
struct device *dev = disk_to_dev(head->disk);
299
299
struct nvme_ns *ns;
300
300
blk_qc_t ret = BLK_QC_T_NONE;
···
378
378
q = blk_alloc_queue(nvme_ns_head_make_request, ctrl->numa_node);
379
379
if (!q)
380
380
goto out;
381
-
q->queuedata = head;
382
381
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
383
382
/* set to a default value for 512 until disk is validated */
384
383
blk_queue_logical_block_size(q, 512);