All of lore.kernel.org
 help / color / mirror / Atom feed
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 15/15] nvdimm/pmem: stop using ->queuedata
Date: Fri,  8 May 2020 18:15:17 +0200	[thread overview]
Message-ID: <20200508161517.252308-16-hch@lst.de> (raw)
In-Reply-To: <20200508161517.252308-1-hch@lst.de>

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvdimm/pmem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 2df6994acf836..f8dc5941215bf 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -196,7 +196,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 	unsigned long start;
 	struct bio_vec bvec;
 	struct bvec_iter iter;
-	struct pmem_device *pmem = q->queuedata;
+	struct pmem_device *pmem = bio->bi_disk->private_data;
 	struct nd_region *nd_region = to_region(pmem);
 
 	if (bio->bi_opf & REQ_PREFLUSH)
@@ -231,7 +231,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 static int pmem_rw_page(struct block_device *bdev, sector_t sector,
 		       struct page *page, unsigned int op)
 {
-	struct pmem_device *pmem = bdev->bd_queue->queuedata;
+	struct pmem_device *pmem = bdev->bd_disk->private_data;
 	blk_status_t rc;
 
 	if (op_is_write(op))
@@ -464,7 +464,6 @@ static int pmem_attach_disk(struct device *dev,
 	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
 	if (pmem->pfn_flags & PFN_MAP)
 		blk_queue_flag_set(QUEUE_FLAG_DAX, q);
-	q->queuedata = pmem;
 
 	disk = alloc_disk_node(0, nid);
 	if (!disk)
@@ -474,6 +473,7 @@ static int pmem_attach_disk(struct device *dev,
 	disk->fops		= &pmem_fops;
 	disk->queue		= q;
 	disk->flags		= GENHD_FL_EXT_DEVT;
+	disk->private_data	= pmem;
 	disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
 	nvdimm_namespace_disk_name(ndns, disk->disk_name);
 	set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
-- 
2.26.2
_______________________________________________
Linux-nvdimm mailing list -- linux-nvdimm@lists.01.org
To unsubscribe send an email to linux-nvdimm-leave@lists.01.org

WARNING: multiple messages have this Message-ID
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 15/15] nvdimm/pmem: stop using ->queuedata
Date: Fri,  8 May 2020 18:15:17 +0200	[thread overview]
Message-ID: <20200508161517.252308-16-hch@lst.de> (raw)
In-Reply-To: <20200508161517.252308-1-hch@lst.de>

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvdimm/pmem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 2df6994acf836..f8dc5941215bf 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -196,7 +196,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 	unsigned long start;
 	struct bio_vec bvec;
 	struct bvec_iter iter;
-	struct pmem_device *pmem = q->queuedata;
+	struct pmem_device *pmem = bio->bi_disk->private_data;
 	struct nd_region *nd_region = to_region(pmem);
 
 	if (bio->bi_opf & REQ_PREFLUSH)
@@ -231,7 +231,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 static int pmem_rw_page(struct block_device *bdev, sector_t sector,
 		       struct page *page, unsigned int op)
 {
-	struct pmem_device *pmem = bdev->bd_queue->queuedata;
+	struct pmem_device *pmem = bdev->bd_disk->private_data;
 	blk_status_t rc;
 
 	if (op_is_write(op))
@@ -464,7 +464,6 @@ static int pmem_attach_disk(struct device *dev,
 	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
 	if (pmem->pfn_flags & PFN_MAP)
 		blk_queue_flag_set(QUEUE_FLAG_DAX, q);
-	q->queuedata = pmem;
 
 	disk = alloc_disk_node(0, nid);
 	if (!disk)
@@ -474,6 +473,7 @@ static int pmem_attach_disk(struct device *dev,
 	disk->fops		= &pmem_fops;
 	disk->queue		= q;
 	disk->flags		= GENHD_FL_EXT_DEVT;
+	disk->private_data	= pmem;
 	disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
 	nvdimm_namespace_disk_name(ndns, disk->disk_name);
 	set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
-- 
2.26.2

WARNING: multiple messages have this Message-ID
From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-bcache@vger.kernel.org, linux-xtensa@linux-xtensa.org,
	linux-raid@vger.kernel.org,
	Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
	linux-nvdimm@lists.01.org, Geoff Levand <geoff@infradead.org>,
	linux-kernel@vger.kernel.org, Jim Paris <jim@jtan.com>,
	linux-block@vger.kernel.org, Minchan Kim <minchan@kernel.org>,
	linux-m68k@lists.linux-m68k.org,
	Philip Kelleher <pjk1939@linux.ibm.com>,
	linuxppc-dev@lists.ozlabs.org,
	Joshua Morris <josh.h.morris@us.ibm.com>,
	Nitin Gupta <ngupta@vflare.org>,
	drbd-dev@lists.linbit.com
Subject: [PATCH 15/15] nvdimm/pmem: stop using ->queuedata
Date: Fri,  8 May 2020 18:15:17 +0200	[thread overview]
Message-ID: <20200508161517.252308-16-hch@lst.de> (raw)
In-Reply-To: <20200508161517.252308-1-hch@lst.de>

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/nvdimm/pmem.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 2df6994acf836..f8dc5941215bf 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -196,7 +196,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 	unsigned long start;
 	struct bio_vec bvec;
 	struct bvec_iter iter;
-	struct pmem_device *pmem = q->queuedata;
+	struct pmem_device *pmem = bio->bi_disk->private_data;
 	struct nd_region *nd_region = to_region(pmem);
 
 	if (bio->bi_opf & REQ_PREFLUSH)
@@ -231,7 +231,7 @@ static blk_qc_t pmem_make_request(struct request_queue *q, struct bio *bio)
 static int pmem_rw_page(struct block_device *bdev, sector_t sector,
 		       struct page *page, unsigned int op)
 {
-	struct pmem_device *pmem = bdev->bd_queue->queuedata;
+	struct pmem_device *pmem = bdev->bd_disk->private_data;
 	blk_status_t rc;
 
 	if (op_is_write(op))
@@ -464,7 +464,6 @@ static int pmem_attach_disk(struct device *dev,
 	blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
 	if (pmem->pfn_flags & PFN_MAP)
 		blk_queue_flag_set(QUEUE_FLAG_DAX, q);
-	q->queuedata = pmem;
 
 	disk = alloc_disk_node(0, nid);
 	if (!disk)
@@ -474,6 +473,7 @@ static int pmem_attach_disk(struct device *dev,
 	disk->fops		= &pmem_fops;
 	disk->queue		= q;
 	disk->flags		= GENHD_FL_EXT_DEVT;
+	disk->private_data	= pmem;
 	disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
 	nvdimm_namespace_disk_name(ndns, disk->disk_name);
 	set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
-- 
2.26.2


  parent reply	other threads:[~2020-05-08 16:16 UTC|newest]

Thread overview: 89+ 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 ` Christoph Hellwig
2020-05-08 16:15 ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 01/15] nfblock: use gendisk private_data Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-09 10:38   ` Geert Uytterhoeven
2020-05-09 10:38     ` Geert Uytterhoeven
2020-05-09 10:38     ` Geert Uytterhoeven
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
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 03/15] drbd: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 04/15] null_blk: stop using ->queuedata for bio mode Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 05/15] ps3vram: stop using ->queuedata Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 06/15] rsxx: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 07/15] umem: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 08/15] zram: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 09/15] lightnvm: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-09  8:38   ` [PATCH 09/15, fіxed] " Christoph Hellwig
2020-05-09  8:38     ` Christoph Hellwig
2020-05-09  8:38     ` Christoph Hellwig
2020-05-09  8:38     ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 10/15] bcache: stop setting ->queuedata Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 11/15] dm: stop using ->queuedata Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 12/15] md: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-13 18:29   ` Song Liu
2020-05-13 18:29     ` Song Liu
2020-05-13 18:29     ` Song Liu
2020-05-13 18:33     ` Christoph Hellwig
2020-05-13 18:33       ` Christoph Hellwig
2020-05-13 18:33       ` Christoph Hellwig
2020-05-13 18:45       ` Song Liu
2020-05-13 18:45         ` Song Liu
2020-05-13 18:45         ` Song Liu
2020-05-08 16:15 ` [PATCH 13/15] nvdimm/blk: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` [PATCH 14/15] nvdimm/btt: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 16:15 ` Christoph Hellwig [this message]
2020-05-08 16:15   ` [PATCH 15/15] nvdimm/pmem: " Christoph Hellwig
2020-05-08 16:15   ` Christoph Hellwig
2020-05-08 18:04 ` remove a few uses of ->queuedata Dan Williams
2020-05-08 18:04   ` Dan Williams
2020-05-08 18:04   ` Dan Williams
2020-05-08 18:04   ` Dan Williams
2020-05-09  8:23   ` Christoph Hellwig
2020-05-09  8:23     ` Christoph Hellwig
2020-05-09  8:23     ` Christoph Hellwig
2020-05-09 15:07     ` Dan Williams
2020-05-09 15:07       ` Dan Williams
2020-05-09 15:07       ` Dan Williams
2020-05-09 15:07       ` Dan Williams
2020-05-12  8:08       ` Christoph Hellwig
2020-05-12  8:08         ` Christoph Hellwig
2020-05-12  8:08         ` Christoph Hellwig
2020-05-13 22:26         ` Dan Williams
2020-05-13 22:26           ` Dan Williams
2020-05-13 22:26           ` Dan Williams
2020-05-13 22:26           ` Dan Williams
2020-05-08 22:13 ` Ming Lei
2020-05-08 22:13   ` Ming Lei
2020-05-08 22:13   ` Ming Lei
2020-05-09  8:24   ` Christoph Hellwig
2020-05-09  8:24     ` Christoph Hellwig
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-16-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 \
    --subject='Re: [PATCH 15/15] nvdimm/pmem: stop using ->queuedata' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.