From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: Jim Paris <jim@jtan.com>, Geoff Levand <geoff@infradead.org>,
Joshua Morris <josh.h.morris@us.ibm.com>,
Philip Kelleher <pjk1939@linux.ibm.com>,
Minchan Kim <minchan@kernel.org>, Nitin Gupta <ngupta@vflare.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org,
linux-xtensa@linux-xtensa.org, drbd-dev@lists.linbit.com,
linux-block@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-bcache@vger.kernel.org, linux-raid@vger.kernel.org,
linux-nvdimm@lists.01.org
Subject: [PATCH 03/15] drbd: stop using ->queuedata
Date: Fri, 8 May 2020 18:15:05 +0200 [thread overview]
Message-ID: <20200508161517.252308-4-hch@lst.de> (raw)
In-Reply-To: <20200508161517.252308-1-hch@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/block/drbd/drbd_main.c | 1 -
drivers/block/drbd/drbd_req.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
index c094c3c2c5d4d..be787b268f044 100644
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
@@ -2805,7 +2805,6 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig
if (!q)
goto out_no_q;
device->rq_queue = q;
- q->queuedata = device;
disk = alloc_disk(1);
if (!disk)
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c
index 840c3aef3c5c9..02c104a0c45e0 100644
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
@@ -1614,7 +1614,7 @@ void do_submit(struct work_struct *ws)
blk_qc_t drbd_make_request(struct request_queue *q, struct bio *bio)
{
- struct drbd_device *device = (struct drbd_device *) q->queuedata;
+ struct drbd_device *device = bio->bi_disk->private_data;
unsigned long start_jif;
blk_queue_split(q, &bio);
--
2.26.2
next prev parent reply other threads:[~2020-05-08 16:16 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-08 16:15 remove a few uses of ->queuedata Christoph Hellwig
2020-05-08 16:15 ` [PATCH 01/15] nfblock: use gendisk private_data Christoph Hellwig
2020-05-09 10:38 ` Geert Uytterhoeven
2020-05-08 16:15 ` [PATCH 02/15] simdisk: stop using ->queuedata Christoph Hellwig
2020-05-08 16:15 ` Christoph Hellwig [this message]
2020-05-08 16:15 ` [PATCH 04/15] null_blk: stop using ->queuedata for bio mode Christoph Hellwig
2020-05-08 16:15 ` [PATCH 05/15] ps3vram: stop using ->queuedata Christoph Hellwig
2020-05-08 16:15 ` [PATCH 06/15] rsxx: " Christoph Hellwig
2020-05-08 16:15 ` [PATCH 07/15] umem: " Christoph Hellwig
2020-05-08 16:15 ` [PATCH 08/15] zram: " Christoph Hellwig
2020-05-08 16:15 ` [PATCH 09/15] lightnvm: " Christoph Hellwig
2020-05-09 8:38 ` [PATCH 09/15, fіxed] " Christoph Hellwig
2020-05-08 16:15 ` [PATCH 10/15] bcache: stop setting ->queuedata Christoph Hellwig
2020-05-08 16:15 ` [PATCH 11/15] dm: stop using ->queuedata Christoph Hellwig
2020-05-08 16:15 ` [PATCH 12/15] md: " Christoph Hellwig
2020-05-13 18:29 ` Song Liu
2020-05-13 18:33 ` Christoph Hellwig
2020-05-13 18:45 ` Song Liu
2020-05-08 16:15 ` [PATCH 13/15] nvdimm/blk: " Christoph Hellwig
2020-05-08 16:15 ` [PATCH 14/15] nvdimm/btt: " Christoph Hellwig
2020-05-08 16:15 ` [PATCH 15/15] nvdimm/pmem: " Christoph Hellwig
2020-05-08 18:04 ` remove a few uses of ->queuedata Dan Williams
2020-05-09 8:23 ` Christoph Hellwig
2020-05-09 15:07 ` Dan Williams
2020-05-12 8:08 ` Christoph Hellwig
2020-05-13 22:26 ` Dan Williams
2020-05-08 22:13 ` Ming Lei
2020-05-09 8:24 ` 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=20200508161517.252308-4-hch@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=drbd-dev@lists.linbit.com \
--cc=geoff@infradead.org \
--cc=jim@jtan.com \
--cc=josh.h.morris@us.ibm.com \
--cc=linux-bcache@vger.kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-nvdimm@lists.01.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=pjk1939@linux.ibm.com \
--cc=sergey.senozhatsky.work@gmail.com \
/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: link
Be 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).