From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, dan.j.williams@intel.com, hch@infradead.org Cc: dm-devel@redhat.com, jack@suse.cz Subject: [PATCH 3/6] fs/dax.c: Start using dax_pgoff() instead of bdev_dax_pgoff() Date: Wed, 12 Feb 2020 12:07:30 -0500 [thread overview] Message-ID: <20200212170733.8092-4-vgoyal@redhat.com> (raw) In-Reply-To: <20200212170733.8092-1-vgoyal@redhat.com> Replace usage of bdev_dax_pgoff() with dax_pgoff() in fs/dax.c Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/dax.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 35da144375a0..921042a81538 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -680,7 +680,7 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping, return __dax_invalidate_entry(mapping, index, false); } -static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev, +static int copy_user_dax(struct dax_device *dax_dev, sector_t dax_offset, sector_t sector, size_t size, struct page *to, unsigned long vaddr) { @@ -689,7 +689,7 @@ static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev, long rc; int id; - rc = bdev_dax_pgoff(bdev, sector, size, &pgoff); + rc = dax_pgoff(dax_offset, sector, size, &pgoff); if (rc) return rc; @@ -990,7 +990,7 @@ static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size, int id, rc; long length; - rc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff); + rc = dax_pgoff(iomap->dax_offset, sector, size, &pgoff); if (rc) return rc; id = dax_read_lock(); @@ -1065,7 +1065,7 @@ int __dax_zero_page_range(struct block_device *bdev, long rc, id; void *kaddr; - rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); + rc = dax_pgoff(get_start_sect(bdev), sector, PAGE_SIZE, &pgoff); if (rc) return rc; @@ -1087,7 +1087,6 @@ static loff_t dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, struct iomap *iomap, struct iomap *srcmap) { - struct block_device *bdev = iomap->bdev; struct dax_device *dax_dev = iomap->dax_dev; struct iov_iter *iter = data; loff_t end = pos + length, done = 0; @@ -1132,7 +1131,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, break; } - ret = bdev_dax_pgoff(bdev, sector, size, &pgoff); + ret = dax_pgoff(iomap->dax_offset, sector, size, &pgoff); if (ret) break; @@ -1312,7 +1311,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, clear_user_highpage(vmf->cow_page, vaddr); break; case IOMAP_MAPPED: - error = copy_user_dax(iomap.bdev, iomap.dax_dev, + error = copy_user_dax(iomap.dax_dev, iomap.dax_offset, sector, PAGE_SIZE, vmf->cow_page, vaddr); break; default: -- 2.20.1 _______________________________________________ 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 (diff)
From: Vivek Goyal <vgoyal@redhat.com> To: linux-fsdevel@vger.kernel.org, linux-nvdimm@lists.01.org, dan.j.williams@intel.com, hch@infradead.org Cc: vgoyal@redhat.com, dm-devel@redhat.com, jack@suse.cz Subject: [PATCH 3/6] fs/dax.c: Start using dax_pgoff() instead of bdev_dax_pgoff() Date: Wed, 12 Feb 2020 12:07:30 -0500 [thread overview] Message-ID: <20200212170733.8092-4-vgoyal@redhat.com> (raw) In-Reply-To: <20200212170733.8092-1-vgoyal@redhat.com> Replace usage of bdev_dax_pgoff() with dax_pgoff() in fs/dax.c Signed-off-by: Vivek Goyal <vgoyal@redhat.com> --- fs/dax.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/fs/dax.c b/fs/dax.c index 35da144375a0..921042a81538 100644 --- a/fs/dax.c +++ b/fs/dax.c @@ -680,7 +680,7 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping, return __dax_invalidate_entry(mapping, index, false); } -static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev, +static int copy_user_dax(struct dax_device *dax_dev, sector_t dax_offset, sector_t sector, size_t size, struct page *to, unsigned long vaddr) { @@ -689,7 +689,7 @@ static int copy_user_dax(struct block_device *bdev, struct dax_device *dax_dev, long rc; int id; - rc = bdev_dax_pgoff(bdev, sector, size, &pgoff); + rc = dax_pgoff(dax_offset, sector, size, &pgoff); if (rc) return rc; @@ -990,7 +990,7 @@ static int dax_iomap_pfn(struct iomap *iomap, loff_t pos, size_t size, int id, rc; long length; - rc = bdev_dax_pgoff(iomap->bdev, sector, size, &pgoff); + rc = dax_pgoff(iomap->dax_offset, sector, size, &pgoff); if (rc) return rc; id = dax_read_lock(); @@ -1065,7 +1065,7 @@ int __dax_zero_page_range(struct block_device *bdev, long rc, id; void *kaddr; - rc = bdev_dax_pgoff(bdev, sector, PAGE_SIZE, &pgoff); + rc = dax_pgoff(get_start_sect(bdev), sector, PAGE_SIZE, &pgoff); if (rc) return rc; @@ -1087,7 +1087,6 @@ static loff_t dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, struct iomap *iomap, struct iomap *srcmap) { - struct block_device *bdev = iomap->bdev; struct dax_device *dax_dev = iomap->dax_dev; struct iov_iter *iter = data; loff_t end = pos + length, done = 0; @@ -1132,7 +1131,7 @@ dax_iomap_actor(struct inode *inode, loff_t pos, loff_t length, void *data, break; } - ret = bdev_dax_pgoff(bdev, sector, size, &pgoff); + ret = dax_pgoff(iomap->dax_offset, sector, size, &pgoff); if (ret) break; @@ -1312,7 +1311,7 @@ static vm_fault_t dax_iomap_pte_fault(struct vm_fault *vmf, pfn_t *pfnp, clear_user_highpage(vmf->cow_page, vaddr); break; case IOMAP_MAPPED: - error = copy_user_dax(iomap.bdev, iomap.dax_dev, + error = copy_user_dax(iomap.dax_dev, iomap.dax_offset, sector, PAGE_SIZE, vmf->cow_page, vaddr); break; default: -- 2.20.1
next prev parent reply other threads:[~2020-02-12 17:07 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-02-12 17:07 [RFC PATCH 0/6] dax: Replace bdev_dax_pgoff() with dax_pgoff() Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal 2020-02-12 17:07 ` [PATCH 1/6] dax: Define a helper dax_pgoff() which takes in dax_offset as argument Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal 2020-02-17 13:30 ` Christoph Hellwig 2020-02-17 13:30 ` Christoph Hellwig 2020-02-17 13:37 ` Matthew Wilcox 2020-02-17 13:37 ` Matthew Wilcox 2020-02-12 17:07 ` [PATCH 2/6] dax,iomap,ext4,ext2,xfs: Save dax_offset in "struct iomap" Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal 2020-02-17 13:31 ` Christoph Hellwig 2020-02-17 13:31 ` Christoph Hellwig 2020-02-12 17:07 ` Vivek Goyal [this message] 2020-02-12 17:07 ` [PATCH 3/6] fs/dax.c: Start using dax_pgoff() instead of bdev_dax_pgoff() Vivek Goyal 2020-02-12 17:07 ` [PATCH 4/6] dax, dm/md: Use " Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal 2020-02-12 17:07 ` [PATCH 5/6] drivers/dax: " Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal 2020-02-12 17:07 ` [PATCH 6/6] dax: Remove bdev_dax_pgoff() helper Vivek Goyal 2020-02-12 17:07 ` Vivek Goyal
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=20200212170733.8092-4-vgoyal@redhat.com \ --to=vgoyal@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=dm-devel@redhat.com \ --cc=hch@infradead.org \ --cc=jack@suse.cz \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-nvdimm@lists.01.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 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.