diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-03-29 19:41:38 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-05-09 16:18:36 -0600 |
| commit | 7890b9701b792a4d75b4adef4abe325383ccfca4 (patch) | |
| tree | f05550f789e6b0022babcedc1d1f258696a19067 /drivers | |
| parent | db5ad6b7f8cdd6d78efef62a1557461d0cbaee54 (diff) | |
| download | linux-7890b9701b792a4d75b4adef4abe325383ccfca4.tar.bz2 | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/multipath.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c index 9f2844935fdf..5f5537d0a024 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -294,7 +294,7 @@ static bool nvme_available_path(struct nvme_ns_head *head) static blk_qc_t nvme_ns_head_make_request(struct request_queue *q, struct bio *bio) { - struct nvme_ns_head *head = q->queuedata; + struct nvme_ns_head *head = bio->bi_disk->private_data; struct device *dev = disk_to_dev(head->disk); struct nvme_ns *ns; blk_qc_t ret = BLK_QC_T_NONE; @@ -378,7 +378,6 @@ int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl, struct nvme_ns_head *head) q = blk_alloc_queue(nvme_ns_head_make_request, ctrl->numa_node); if (!q) goto out; - q->queuedata = head; blk_queue_flag_set(QUEUE_FLAG_NONROT, q); /* set to a default value for 512 until disk is validated */ blk_queue_logical_block_size(q, 512); |