On Tue, Jul 01, 2025 at 12:40:40PM +0200, Christoph Hellwig wrote:
> And use bt_file for both bdev and shmem backed buftargs.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Woot, that's a nice savings!
Reviewed-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_buf.c | 4 ++--
> fs/xfs/xfs_buf.h | 1 -
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c
> index 661f6c70e9d0..b73da43f489c 100644
> --- a/fs/xfs/xfs_buf.c
> +++ b/fs/xfs/xfs_buf.c
> @@ -1683,7 +1683,7 @@ xfs_free_buftarg(
> fs_put_dax(btp->bt_daxdev, btp->bt_mount);
> /* the main block device is closed by kill_block_super */
> if (btp->bt_bdev != btp->bt_mount->m_super->s_bdev)
> - bdev_fput(btp->bt_bdev_file);
> + bdev_fput(btp->bt_file);
> kfree(btp);
> }
>
> @@ -1802,7 +1802,7 @@ xfs_alloc_buftarg(
> btp = kzalloc(sizeof(*btp), GFP_KERNEL | __GFP_NOFAIL);
>
> btp->bt_mount = mp;
> - btp->bt_bdev_file = bdev_file;
> + btp->bt_file = bdev_file;
> btp->bt_bdev = file_bdev(bdev_file);
> btp->bt_dev = btp->bt_bdev->bd_dev;
> btp->bt_daxdev = fs_dax_get_by_bdev(btp->bt_bdev, &btp->bt_dax_part_off,
> diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h
> index 7987a6d64874..b269e115d9ac 100644
> --- a/fs/xfs/xfs_buf.h
> +++ b/fs/xfs/xfs_buf.h
> @@ -94,7 +94,6 @@ void xfs_buf_cache_destroy(struct xfs_buf_cache *bch);
> */
> struct xfs_buftarg {
> dev_t bt_dev;
> - struct file *bt_bdev_file;
> struct block_device *bt_bdev;
> struct dax_device *bt_daxdev;
> struct file *bt_file;
> --
> 2.47.2
>
>
