Commit 6c2eddd6 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

umem: stop using ->queuedata 



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

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent a2f143fc

drivers/block/umem.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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)

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",

	pr_debug("mm_make_request %llu %u\n",

		 (unsigned long long)bio->bi_iter.bi_sector,

		 (unsigned long long)bio->bi_iter.bi_sector,

		 bio->bi_iter.bi_size);

		 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);

	card->queue = blk_alloc_queue(mm_make_request, NUMA_NO_NODE);

	if (!card->queue)

	if (!card->queue)

		goto failed_alloc;

		goto failed_alloc;

	card->queue->queuedata = card;





	tasklet_init(&card->tasklet, process_page, (unsigned long)card);

	tasklet_init(&card->tasklet, process_page, (unsigned long)card);