From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: linux-bcache@vger.kernel.org, linux-xtensa@linux-xtensa.org, linux-m68k@vger.kernel.org, linux-nvdimm@lists.01.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-nvme@lists.infradead.org, linux-raid@vger.kernel.org, dm-devel@redhat.com, drbd-dev@tron.linbit.com, linuxppc-dev@lists.ozlabs.org Subject: [PATCH 07/20] umem: stop using ->queuedata Date: Mon, 29 Jun 2020 21:39:34 +0200 [thread overview] Message-ID: <20200629193947.2705954-8-hch@lst.de> (raw) In-Reply-To: <20200629193947.2705954-1-hch@lst.de> Instead of setting up the queuedata as well just use one private data field. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/block/umem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 1e2aa5ae27963c..5498f1cf36b3fe 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); -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: dm-devel@redhat.com, linux-kernel@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-xtensa@linux-xtensa.org, drbd-dev@lists.linbit.com, linuxppc-dev@lists.ozlabs.org, linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org, linux-nvdimm@lists.01.org, linux-nvme@lists.infradead.org, linux-s390@vger.kernel.org Subject: [PATCH 07/20] umem: stop using ->queuedata Date: Mon, 29 Jun 2020 21:39:34 +0200 [thread overview] Message-ID: <20200629193947.2705954-8-hch@lst.de> (raw) Message-ID: <20200629193934.yG8F1DmCKTW6zKuO0iKQ25AqFGPFqb-oOIbK7WV6zjI@z> (raw) In-Reply-To: <20200629193947.2705954-1-hch@lst.de> Instead of setting up the queuedata as well just use one private data field. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/block/umem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 1e2aa5ae27963c..5498f1cf36b3fe 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); -- 2.26.2
next prev parent reply other threads:[~2020-06-29 19:39 UTC|newest] Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-06-29 19:39 rename ->make_request_fn and move it to the block_device_operations Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 01/20] nfblock: stop using ->queuedata Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 21:47 ` Geert Uytterhoeven 2020-06-29 21:47 ` Geert Uytterhoeven 2020-06-29 19:39 ` [PATCH 02/20] simdisk: " Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 03/20] drbd: " Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 04/20] null_blk: stop using ->queuedata for bio mode Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 05/20] ps3vram: stop using ->queuedata Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 06/20] rsxx: " Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig [this message] 2020-06-29 19:39 ` [PATCH 07/20] umem: " Christoph Hellwig 2020-06-29 19:39 ` [PATCH 08/20] zram: " Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 09/20] bcache: stop setting ->queuedata Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 10/20] dm: stop using ->queuedata Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 11/20] fs: remove a weird comment in submit_bh_wbc Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-30 13:54 ` Jens Axboe 2020-06-30 13:54 ` Jens Axboe 2020-06-29 19:39 ` [PATCH 12/20] block: remove the request_queue argument from blk_queue_split Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 13/20] block: tidy up a warning in bio_check_ro Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 14/20] block: remove the NULL queue check in generic_make_request_checks Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 15/20] block: remove the nr_sectors variable " Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 16/20] block: move ->make_request_fn to struct block_device_operations Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 17/20] block: rename generic_make_request to submit_bio_noacct Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 18/20] block: refator submit_bio_noacct Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-07-02 14:10 ` Qian Cai 2020-07-02 14:10 ` Qian Cai [not found] ` <20200702141001.GA3834-J5quhbR+WMc@public.gmane.org> 2020-07-02 15:14 ` Christoph Hellwig 2020-07-02 15:14 ` Christoph Hellwig 2020-07-02 15:52 ` Naresh Kamboju 2020-07-02 15:52 ` Naresh Kamboju 2020-07-02 15:15 ` Naresh Kamboju 2020-07-02 15:15 ` Naresh Kamboju 2020-06-29 19:39 ` [PATCH 19/20] block: shortcut __submit_bio_noacct for blk-mq drivers Christoph Hellwig 2020-06-29 19:39 ` Christoph Hellwig 2020-06-29 19:39 ` [PATCH 20/20] block: remove direct_make_request Christoph Hellwig 2020-06-30 13:57 ` rename ->make_request_fn and move it to the block_device_operations Jens Axboe 2020-06-30 13:57 ` Jens Axboe 2020-06-30 15:43 ` Jens Axboe 2020-06-30 15:43 ` Jens Axboe 2020-06-30 18:19 ` Christoph Hellwig 2020-06-30 18:19 ` Christoph Hellwig 2020-06-30 18:21 ` Jens Axboe 2020-06-30 18:21 ` Jens Axboe 2020-06-30 18:55 ` Jens Axboe 2020-07-01 8:59 rename ->make_request_fn and move it to the block_device_operations v2 Christoph Hellwig 2020-07-01 8:59 ` [PATCH 07/20] umem: stop using ->queuedata Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200629193947.2705954-8-hch@lst.de \ --to=hch@lst.de \ --cc=axboe@kernel.dk \ --cc=dm-devel@redhat.com \ --cc=drbd-dev@tron.linbit.com \ --cc=linux-bcache@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-m68k@vger.kernel.org \ --cc=linux-nvdimm@lists.01.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-raid@vger.kernel.org \ --cc=linux-s390@vger.kernel.org \ --cc=linux-xtensa@linux-xtensa.org \ --cc=linuxppc-dev@lists.ozlabs.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).