From: "Darrick J. Wong" <djwong@kernel.org>
To: Christoph Hellwig <hch@lst.de>
Cc: nvdimm@lists.linux.dev, Mike Snitzer <snitzer@redhat.com>,
linux-s390@vger.kernel.org, linux-erofs@lists.ozlabs.org,
virtualization@lists.linux-foundation.org,
linux-xfs@vger.kernel.org, dm-devel@redhat.com,
linux-fsdevel@vger.kernel.org,
Dan Williams <dan.j.williams@intel.com>,
linux-ext4@vger.kernel.org, Ira Weiny <ira.weiny@intel.com>
Subject: Re: [PATCH 21/29] xfs: move dax device handling into xfs_{alloc,free}_buftarg
Date: Tue, 23 Nov 2021 14:55:48 -0800 [thread overview]
Message-ID: <20211123225548.GP266024@magnolia> (raw)
In-Reply-To: <20211109083309.584081-22-hch@lst.de>
On Tue, Nov 09, 2021 at 09:33:01AM +0100, Christoph Hellwig wrote:
> Hide the DAX device lookup from the xfs_super.c code.
>
> Reviewed-by: Christoph Hellwig <hch@lst.de>
This looks to be a straightforward conversion.
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
--D
> ---
> fs/xfs/xfs_buf.c | 8 ++++----
> fs/xfs/xfs_buf.h | 4 ++--
> fs/xfs/xfs_super.c | 26 +++++---------------------
> 3 files changed, 11 insertions(+), 27 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 631c5a61d89b7..4d4553ffa7050 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1892,6 +1892,7 @@ xfs_free_buftarg(
> list_lru_destroy(&btp->bt_lru);
>
> blkdev_issue_flush(btp->bt_bdev);
> + fs_put_dax(btp->bt_daxdev);
>
> kmem_free(btp);
> }
> @@ -1932,11 +1933,10 @@ xfs_setsize_buftarg_early(
> return xfs_setsize_buftarg(btp, bdev_logical_block_size(bdev));
> }
>
> -xfs_buftarg_t *
> +struct xfs_buftarg *
> xfs_alloc_buftarg(
> struct xfs_mount *mp,
> - struct block_device *bdev,
> - struct dax_device *dax_dev)
> + struct block_device *bdev)
> {
> xfs_buftarg_t *btp;
>
> @@ -1945,7 +1945,7 @@ xfs_alloc_buftarg(
> btp->bt_mount = mp;
> btp->bt_dev = bdev->bd_dev;
> btp->bt_bdev = bdev;
> - btp->bt_daxdev = dax_dev;
> + btp->bt_daxdev = fs_dax_get_by_bdev(bdev);
>
> /*
> * Buffer IO error rate limiting. Limit it to no more than 10 messages
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index 6b0200b8007d1..bd7f709f0d232 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -338,8 +338,8 @@ xfs_buf_update_cksum(struct xfs_buf *bp, unsigned long cksum_offset)
> /*
> * Handling of buftargs.
> */
> -extern struct xfs_buftarg *xfs_alloc_buftarg(struct xfs_mount *,
> - struct block_device *, struct dax_device *);
> +struct xfs_buftarg *xfs_alloc_buftarg(struct xfs_mount *mp,
> + struct block_device *bdev);
> extern void xfs_free_buftarg(struct xfs_buftarg *);
> extern void xfs_buftarg_wait(struct xfs_buftarg *);
> extern void xfs_buftarg_drain(struct xfs_buftarg *);
> diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c
> index 3a45d5caa28d5..7262716afb215 100644
> --- a/fs/xfs/xfs_super.c
> +++ b/fs/xfs/xfs_super.c
> @@ -391,26 +391,19 @@ STATIC void
> xfs_close_devices(
> struct xfs_mount *mp)
> {
> - struct dax_device *dax_ddev = mp->m_ddev_targp->bt_daxdev;
> -
> if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) {
> struct block_device *logdev = mp->m_logdev_targp->bt_bdev;
> - struct dax_device *dax_logdev = mp->m_logdev_targp->bt_daxdev;
>
> xfs_free_buftarg(mp->m_logdev_targp);
> xfs_blkdev_put(logdev);
> - fs_put_dax(dax_logdev);
> }
> if (mp->m_rtdev_targp) {
> struct block_device *rtdev = mp->m_rtdev_targp->bt_bdev;
> - struct dax_device *dax_rtdev = mp->m_rtdev_targp->bt_daxdev;
>
> xfs_free_buftarg(mp->m_rtdev_targp);
> xfs_blkdev_put(rtdev);
> - fs_put_dax(dax_rtdev);
> }
> xfs_free_buftarg(mp->m_ddev_targp);
> - fs_put_dax(dax_ddev);
> }
>
> /*
> @@ -428,8 +421,6 @@ xfs_open_devices(
> struct xfs_mount *mp)
> {
> struct block_device *ddev = mp->m_super->s_bdev;
> - struct dax_device *dax_ddev = fs_dax_get_by_bdev(ddev);
> - struct dax_device *dax_logdev = NULL, *dax_rtdev = NULL;
> struct block_device *logdev = NULL, *rtdev = NULL;
> int error;
>
> @@ -439,8 +430,7 @@ xfs_open_devices(
> if (mp->m_logname) {
> error = xfs_blkdev_get(mp, mp->m_logname, &logdev);
> if (error)
> - goto out;
> - dax_logdev = fs_dax_get_by_bdev(logdev);
> + return error;
> }
>
> if (mp->m_rtname) {
> @@ -454,25 +444,24 @@ xfs_open_devices(
> error = -EINVAL;
> goto out_close_rtdev;
> }
> - dax_rtdev = fs_dax_get_by_bdev(rtdev);
> }
>
> /*
> * Setup xfs_mount buffer target pointers
> */
> error = -ENOMEM;
> - mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev, dax_ddev);
> + mp->m_ddev_targp = xfs_alloc_buftarg(mp, ddev);
> if (!mp->m_ddev_targp)
> goto out_close_rtdev;
>
> if (rtdev) {
> - mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev, dax_rtdev);
> + mp->m_rtdev_targp = xfs_alloc_buftarg(mp, rtdev);
> if (!mp->m_rtdev_targp)
> goto out_free_ddev_targ;
> }
>
> if (logdev && logdev != ddev) {
> - mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev, dax_logdev);
> + mp->m_logdev_targp = xfs_alloc_buftarg(mp, logdev);
> if (!mp->m_logdev_targp)
> goto out_free_rtdev_targ;
> } else {
> @@ -488,14 +477,9 @@ xfs_open_devices(
> xfs_free_buftarg(mp->m_ddev_targp);
> out_close_rtdev:
> xfs_blkdev_put(rtdev);
> - fs_put_dax(dax_rtdev);
> out_close_logdev:
> - if (logdev && logdev != ddev) {
> + if (logdev && logdev != ddev)
> xfs_blkdev_put(logdev);
> - fs_put_dax(dax_logdev);
> - }
> - out:
> - fs_put_dax(dax_ddev);
> return error;
> }
>
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-11-23 22:55 UTC|newest]
Thread overview: 101+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 8:32 decouple DAX from block devices Christoph Hellwig
2021-11-09 8:32 ` [PATCH 01/29] nvdimm/pmem: move dax_attribute_group from dax to pmem Christoph Hellwig
2021-11-17 17:44 ` Dan Williams
2021-11-19 6:56 ` Christoph Hellwig
2021-11-19 17:21 ` Dan Williams
2021-11-09 8:32 ` [PATCH 02/29] dm: make the DAX support dependend on CONFIG_FS_DAX Christoph Hellwig
2021-11-17 17:23 ` Dan Williams
2021-11-19 6:54 ` Christoph Hellwig
2021-11-23 2:54 ` Dan Williams
2021-11-23 5:56 ` Christoph Hellwig
2021-11-09 8:32 ` [PATCH 03/29] dax: remove CONFIG_DAX_DRIVER Christoph Hellwig
2021-11-17 17:43 ` Dan Williams
2021-11-23 2:54 ` Dan Williams
2021-11-09 8:32 ` [PATCH 04/29] dax: simplify the dax_device <-> gendisk association Christoph Hellwig
2021-11-23 3:33 ` Dan Williams
2021-11-23 5:57 ` Christoph Hellwig
2021-11-23 19:33 ` Dan Williams
2021-11-09 8:32 ` [PATCH 05/29] dax: remove the pgmap sanity checks in generic_fsdax_supported Christoph Hellwig
2021-11-23 3:35 ` Dan Williams
2021-11-09 8:32 ` [PATCH 06/29] dax: move the partition alignment check into fs_dax_get_by_bdev Christoph Hellwig
2021-11-23 3:41 ` Dan Williams
2021-11-23 22:25 ` Darrick J. Wong
2021-11-24 6:36 ` Christoph Hellwig
2021-11-09 8:32 ` [PATCH 07/29] xfs: factor out a xfs_setup_dax_always helper Christoph Hellwig
2021-11-17 17:31 ` Darrick J. Wong
2021-11-23 3:51 ` Dan Williams
2021-11-09 8:32 ` [PATCH 08/29] dax: remove dax_capable Christoph Hellwig
2021-11-23 3:58 ` Dan Williams
2021-11-23 22:31 ` Darrick J. Wong
2021-11-24 6:37 ` Christoph Hellwig
2021-11-09 8:32 ` [PATCH 09/29] dm-linear: add a linear_dax_pgoff helper Christoph Hellwig
2021-11-23 3:59 ` Dan Williams
2021-11-09 8:32 ` [PATCH 10/29] dm-log-writes: add a log_writes_dax_pgoff helper Christoph Hellwig
2021-11-23 4:02 ` Dan Williams
2021-11-09 8:32 ` [PATCH 11/29] dm-stripe: add a stripe_dax_pgoff helper Christoph Hellwig
2021-11-23 4:16 ` Dan Williams
2021-11-09 8:32 ` [PATCH 12/29] fsdax: remove a pointless __force cast in copy_cow_page_dax Christoph Hellwig
2021-11-23 4:17 ` Dan Williams
2021-11-23 22:33 ` Darrick J. Wong
2021-11-09 8:32 ` [PATCH 13/29] fsdax: use a saner calling convention for copy_cow_page_dax Christoph Hellwig
2021-11-23 19:35 ` Dan Williams
2021-11-23 22:33 ` Darrick J. Wong
2021-11-09 8:32 ` [PATCH 14/29] fsdax: simplify the pgoff calculation Christoph Hellwig
2021-11-23 19:44 ` Dan Williams
2021-11-23 22:36 ` Darrick J. Wong
2021-11-24 6:39 ` Christoph Hellwig
2021-11-09 8:32 ` [PATCH 15/29] xfs: add xfs_zero_range and xfs_truncate_page helpers Christoph Hellwig
2021-11-23 21:15 ` Dan Williams
2021-11-23 22:37 ` Darrick J. Wong
2021-11-09 8:32 ` [PATCH 16/29] fsdax: simplify the offset check in dax_iomap_zero Christoph Hellwig
2021-11-23 21:16 ` Dan Williams
2021-11-23 22:40 ` Darrick J. Wong
2021-11-09 8:32 ` [PATCH 17/29] fsdax: factor out a dax_memzero helper Christoph Hellwig
2021-11-23 21:22 ` Dan Williams
2021-11-23 22:44 ` Darrick J. Wong
2021-11-24 6:47 ` Christoph Hellwig
2021-11-09 8:32 ` [PATCH 18/29] fsdax: decouple zeroing from the iomap buffered I/O code Christoph Hellwig
2021-11-23 21:46 ` Dan Williams
2021-11-24 6:50 ` Christoph Hellwig
2021-11-23 22:53 ` Darrick J. Wong
2021-11-24 6:52 ` Christoph Hellwig
2021-11-09 8:32 ` [PATCH 19/29] ext2: cleanup the dax handling in ext2_fill_super Christoph Hellwig
2021-11-23 21:48 ` Dan Williams
2021-11-23 22:54 ` Darrick J. Wong
2021-11-09 8:33 ` [PATCH 20/29] ext4: cleanup the dax handling in ext4_fill_super Christoph Hellwig
2021-11-23 21:49 ` Dan Williams
2021-11-23 22:54 ` Darrick J. Wong
2021-11-24 6:53 ` Christoph Hellwig
2021-11-09 8:33 ` [PATCH 21/29] xfs: move dax device handling into xfs_{alloc, free}_buftarg Christoph Hellwig
2021-11-23 22:55 ` Darrick J. Wong [this message]
2021-11-24 2:40 ` Dan Williams
2021-11-24 3:05 ` [PATCH 21/29] xfs: move dax device handling into xfs_{alloc,free}_buftarg Darrick J. Wong
2021-11-24 6:55 ` Christoph Hellwig
2021-11-09 8:33 ` [PATCH 22/29] iomap: add a IOMAP_DAX flag Christoph Hellwig
2021-11-23 23:00 ` Darrick J. Wong
2021-11-24 2:47 ` Dan Williams
2021-11-24 7:10 ` Christoph Hellwig
2021-11-09 8:33 ` [PATCH 23/29] xfs: use IOMAP_DAX to check for DAX mappings Christoph Hellwig
2021-11-23 23:01 ` Darrick J. Wong
2021-11-24 7:14 ` Christoph Hellwig
2021-11-24 2:49 ` Dan Williams
2021-11-09 8:33 ` [PATCH 24/29] xfs: use xfs_direct_write_iomap_ops for DAX zeroing Christoph Hellwig
2021-11-23 23:02 ` Darrick J. Wong
2021-11-24 2:52 ` Dan Williams
2021-11-09 8:33 ` [PATCH 25/29] dax: return the partition offset from fs_dax_get_by_bdev Christoph Hellwig
2021-11-24 2:56 ` Dan Williams
2021-11-24 6:59 ` Christoph Hellwig
2021-11-09 8:33 ` [PATCH 26/29] fsdax: shift partition offset handling into the file systems Christoph Hellwig
2021-11-23 23:11 ` Darrick J. Wong
2021-11-24 3:21 ` Dan Williams
2021-11-24 3:44 ` Gao Xiang
2021-11-09 8:33 ` [PATCH 27/29] dax: fix up some of the block device related ifdefs Christoph Hellwig
2021-11-23 23:13 ` Darrick J. Wong
2021-11-24 3:47 ` Dan Williams
2021-11-09 8:33 ` [PATCH 28/29] iomap: build the block based code conditionally Christoph Hellwig
2021-11-23 23:13 ` Darrick J. Wong
2021-11-24 3:51 ` Dan Williams
2021-11-09 8:33 ` [PATCH 29/29] fsdax: don't require CONFIG_BLOCK Christoph Hellwig
2021-11-23 23:13 ` Darrick J. Wong
2021-11-24 3:52 ` Dan Williams
2021-11-29 10:21 decouple DAX from block devices v2 Christoph Hellwig
2021-11-29 10:21 ` [PATCH 21/29] xfs: move dax device handling into xfs_{alloc, free}_buftarg 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=20211123225548.GP266024@magnolia \
--to=djwong@kernel.org \
--cc=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).