aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/block
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-07-01 10:59:34 +0200
committerJens Axboe <axboe@kernel.dk>2020-07-01 07:27:23 -0600
commit6c2eddd63b448287e678d8d6099b29bb17e9cd3d (patch)
tree9f16e1743d6fb1c516bd49a174c6d6e953445e80 /drivers/block
parentrsxx: stop using ->queuedata (diff)
downloadwireguard-linux-6c2eddd63b448287e678d8d6099b29bb17e9cd3d.tar.xz
wireguard-linux-6c2eddd63b448287e678d8d6099b29bb17e9cd3d.zip
umem: 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>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/umem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/umem.c b/drivers/block/umem.c
index 1e2aa5ae2796..5498f1cf36b3 100644
--- a/drivers/block/umem.c
+++ b/drivers/block/umem.c
@@ -521,7 +521,8 @@ static int mm_check_plugged(struct cardinfo *card)
static blk_qc_t mm_make_request(struct request_queue *q, struct bio *bio)
{
- struct cardinfo *card = q->queuedata;
+ struct cardinfo *card = bio->bi_disk->private_data;
+
pr_debug("mm_make_request %llu %u\n",
(unsigned long long)bio->bi_iter.bi_sector,
bio->bi_iter.bi_size);
@@ -888,7 +889,6 @@ static int mm_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
card->queue = blk_alloc_queue(mm_make_request, NUMA_NO_NODE);
if (!card->queue)
goto failed_alloc;
- card->queue->queuedata = card;
tasklet_init(&card->tasklet, process_page, (unsigned long)card);