Commit 9b027aa3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Carlos Maiolino
Browse files

xfs: remove the bt_bdev_file buftarg field 



And use bt_file for both bdev and shmem backed buftargs.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohn Garry <john.g.garry@oracle.com>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarCarlos Maiolino <cem@kernel.org>
parent 988a1682

fs/xfs/xfs_buf.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}
@@ -1798,7 +1798,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,

fs/xfs/xfs_buf.h

+0 −1
Original line number Diff line number Diff line
@@ -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;