From: Dan Williams <dan.j.williams@intel.com>
To: Christoph Hellwig <hch@lst.de>
Cc: Mike Snitzer <snitzer@redhat.com>,
Ira Weiny <ira.weiny@intel.com>,
device-mapper development <dm-devel@redhat.com>,
linux-xfs <linux-xfs@vger.kernel.org>,
Linux NVDIMM <nvdimm@lists.linux.dev>,
linux-s390 <linux-s390@vger.kernel.org>,
linux-fsdevel <linux-fsdevel@vger.kernel.org>,
linux-erofs@lists.ozlabs.org,
linux-ext4 <linux-ext4@vger.kernel.org>,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH 11/11] dax: move bdev_dax_pgoff to fs/dax.c
Date: Wed, 27 Oct 2021 18:44:04 -0700 [thread overview]
Message-ID: <CAPcyv4ht6fZOdx4YN9FRCnmD2Wy4zzG7nJPQSdSPAgvZNHxoFw@mail.gmail.com> (raw)
In-Reply-To: <20211018044054.1779424-12-hch@lst.de>
On Sun, Oct 17, 2021 at 9:41 PM Christoph Hellwig <hch@lst.de> wrote:
>
> No functional changet, but this will allow for a tighter integration
s/changet/changes/
> with the iomap code, including possible passing the partition offset
s/possible/possibly/
> in the iomap in the future. For now it mostly avoids growing more
s/now/now,/
...all of the above fixed up locally.
Other than that, it looks good to me.
> callers outside of fs/dax.c.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> drivers/dax/super.c | 14 --------------
> fs/dax.c | 13 +++++++++++++
> include/linux/dax.h | 1 -
> 3 files changed, 13 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/dax/super.c b/drivers/dax/super.c
> index 803942586d1b6..c0910687fbcb2 100644
> --- a/drivers/dax/super.c
> +++ b/drivers/dax/super.c
> @@ -67,20 +67,6 @@ void dax_remove_host(struct gendisk *disk)
> }
> EXPORT_SYMBOL_GPL(dax_remove_host);
>
> -int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size,
> - pgoff_t *pgoff)
> -{
> - sector_t start_sect = bdev ? get_start_sect(bdev) : 0;
> - phys_addr_t phys_off = (start_sect + sector) * 512;
> -
> - if (pgoff)
> - *pgoff = PHYS_PFN(phys_off);
> - if (phys_off % PAGE_SIZE || size % PAGE_SIZE)
> - return -EINVAL;
> - return 0;
> -}
> -EXPORT_SYMBOL(bdev_dax_pgoff);
> -
> /**
> * dax_get_by_host() - temporary lookup mechanism for filesystem-dax
> * @bdev: block device to find a dax_device for
> diff --git a/fs/dax.c b/fs/dax.c
> index 4e3e5a283a916..eb715363fd667 100644
> --- a/fs/dax.c
> +++ b/fs/dax.c
> @@ -709,6 +709,19 @@ int dax_invalidate_mapping_entry_sync(struct address_space *mapping,
> return __dax_invalidate_entry(mapping, index, false);
> }
>
> +static int bdev_dax_pgoff(struct block_device *bdev, sector_t sector, size_t size,
> + pgoff_t *pgoff)
> +{
> + sector_t start_sect = bdev ? get_start_sect(bdev) : 0;
> + phys_addr_t phys_off = (start_sect + sector) * 512;
> +
> + if (pgoff)
> + *pgoff = PHYS_PFN(phys_off);
> + if (phys_off % PAGE_SIZE || size % PAGE_SIZE)
> + return -EINVAL;
> + return 0;
> +}
> +
> static int copy_cow_page_dax(struct block_device *bdev, struct dax_device *dax_dev,
> sector_t sector, struct page *to, unsigned long vaddr)
> {
> diff --git a/include/linux/dax.h b/include/linux/dax.h
> index 439c3c70e347b..324363b798ecd 100644
> --- a/include/linux/dax.h
> +++ b/include/linux/dax.h
> @@ -107,7 +107,6 @@ static inline bool daxdev_mapping_supported(struct vm_area_struct *vma,
> #endif
>
> struct writeback_control;
> -int bdev_dax_pgoff(struct block_device *, sector_t, size_t, pgoff_t *pgoff);
> #if IS_ENABLED(CONFIG_FS_DAX)
> int dax_add_host(struct dax_device *dax_dev, struct gendisk *disk);
> void dax_remove_host(struct gendisk *disk);
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-10-28 1:44 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 4:40 futher decouple DAX from block devices Christoph Hellwig
2021-10-18 4:40 ` [PATCH 01/11] dm: make the DAX support dependend on CONFIG_FS_DAX Christoph Hellwig
2021-10-27 20:53 ` Dan Williams
2021-11-01 16:12 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 02/11] dax: remove CONFIG_DAX_DRIVER Christoph Hellwig
2021-10-27 20:54 ` Dan Williams
2021-10-18 4:40 ` [PATCH 03/11] dax: simplify the dax_device <-> gendisk association Christoph Hellwig
2021-10-27 22:03 ` Dan Williams
2021-10-29 4:57 ` Ira Weiny
2021-11-01 16:28 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 04/11] dax: remove the pgmap sanity checks in generic_fsdax_supported Christoph Hellwig
2021-10-27 23:02 ` Dan Williams
2021-10-18 4:40 ` [PATCH 05/11] dax: move the partition alignment check into fs_dax_get_by_bdev Christoph Hellwig
2021-10-27 23:07 ` Dan Williams
2021-10-18 4:40 ` [PATCH 06/11] xfs: factor out a xfs_setup_dax helper Christoph Hellwig
2021-10-18 16:43 ` Darrick J. Wong
2021-10-19 7:23 ` Christoph Hellwig
2021-10-27 23:37 ` Dan Williams
2021-10-18 4:40 ` [PATCH 07/11] dax: remove dax_capable Christoph Hellwig
2021-10-18 12:25 ` Gao Xiang
2021-10-19 15:44 ` [dm-devel] " Darrick J. Wong
2021-10-28 0:20 ` Dan Williams
2021-10-28 0:16 ` Dan Williams
2021-11-01 16:17 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 08/11] dm-linear: add a linear_dax_pgoff helper Christoph Hellwig
2021-10-28 1:32 ` Dan Williams
2021-11-01 16:18 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 09/11] dm-log-writes: add a log_writes_dax_pgoff helper Christoph Hellwig
2021-10-28 1:36 ` Dan Williams
2021-11-01 16:19 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 10/11] dm-stripe: add a stripe_dax_pgoff helper Christoph Hellwig
2021-10-28 1:41 ` Dan Williams
2021-11-01 16:21 ` Mike Snitzer
2021-10-18 4:40 ` [PATCH 11/11] dax: move bdev_dax_pgoff to fs/dax.c Christoph Hellwig
2021-10-28 1:44 ` Dan Williams [this message]
2021-10-27 20:46 ` futher decouple DAX from block devices Dan Williams
2021-10-28 23:51 ` Stephen Rothwell
2021-10-29 15:42 ` Dan Williams
2021-10-29 15:55 ` Darrick J. Wong
2021-10-29 16:16 ` Dan Williams
2021-11-03 17:59 ` Eric Sandeen
2021-11-04 8:17 ` Christoph Hellwig
2021-11-04 17:34 ` Darrick J. Wong
2021-11-04 17:35 ` Christoph Hellwig
2021-11-04 18:10 ` Dan Williams
2021-11-04 19:04 ` Darrick J. Wong
2021-11-05 3:09 ` Theodore Ts'o
2021-11-05 3:30 ` Matthew Wilcox
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=CAPcyv4ht6fZOdx4YN9FRCnmD2Wy4zzG7nJPQSdSPAgvZNHxoFw@mail.gmail.com \
--to=dan.j.williams@intel.com \
--cc=dm-devel@redhat.com \
--cc=hch@lst.de \
--cc=ira.weiny@intel.com \
--cc=linux-erofs@lists.ozlabs.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=snitzer@redhat.com \
--cc=virtualization@lists.linux-foundation.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: 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).