Commit 30fa529e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: add a xfs_inode_buftarg helper 



Add a new xfs_inode_buftarg helper that gets the data I/O buftarg for a
given inode.  Replace the existing xfs_find_bdev_for_inode and
xfs_find_daxdev_for_inode helpers with this new general one and cleanup
some of the callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent 25a40957

fs/xfs/xfs_aops.c

+5 −29
Original line number Diff line number Diff line
@@ -30,32 +30,6 @@ XFS_WPC(struct iomap_writepage_ctx *ctx) 
	return container_of(ctx, struct xfs_writepage_ctx, ctx);

}



struct block_device *

xfs_find_bdev_for_inode(

	struct inode		*inode)

{

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;



	if (XFS_IS_REALTIME_INODE(ip))

		return mp->m_rtdev_targp->bt_bdev;

	else

		return mp->m_ddev_targp->bt_bdev;

}



struct dax_device *

xfs_find_daxdev_for_inode(

	struct inode		*inode)

{

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;



	if (XFS_IS_REALTIME_INODE(ip))

		return mp->m_rtdev_targp->bt_daxdev;

	else

		return mp->m_ddev_targp->bt_daxdev;

}



/*

 * Fast and loose check if this write could update the on-disk inode size.

 */
@@ -609,9 +583,11 @@ xfs_dax_writepages( 
	struct address_space	*mapping,

	struct writeback_control *wbc)

{

	xfs_iflags_clear(XFS_I(mapping->host), XFS_ITRUNCATED);

	struct xfs_inode	*ip = XFS_I(mapping->host);



	xfs_iflags_clear(ip, XFS_ITRUNCATED);

	return dax_writeback_mapping_range(mapping,

			xfs_find_bdev_for_inode(mapping->host), wbc);

			xfs_inode_buftarg(ip)->bt_bdev, wbc);

}



STATIC sector_t
@@ -661,7 +637,7 @@ xfs_iomap_swapfile_activate( 
	struct file			*swap_file,

	sector_t			*span)

{

	sis->bdev = xfs_find_bdev_for_inode(file_inode(swap_file));

	sis->bdev = xfs_inode_buftarg(XFS_I(file_inode(swap_file)))->bt_bdev;

	return iomap_swapfile_activate(sis, swap_file, span,

			&xfs_read_iomap_ops);

}

fs/xfs/xfs_aops.h

+0 −3
Original line number Diff line number Diff line
@@ -11,7 +11,4 @@ extern const struct address_space_operations xfs_dax_aops; 


int	xfs_setfilesize(struct xfs_inode *ip, xfs_off_t offset, size_t size);



extern struct block_device *xfs_find_bdev_for_inode(struct inode *);

extern struct dax_device *xfs_find_daxdev_for_inode(struct inode *);



#endif /* __XFS_AOPS_H__ */

fs/xfs/xfs_bmap_util.c

+8 −7
Original line number Diff line number Diff line
@@ -58,10 +58,11 @@ xfs_zero_extent( 
	xfs_off_t		count_fsb)

{

	struct xfs_mount	*mp = ip->i_mount;

	struct xfs_buftarg	*target = xfs_inode_buftarg(ip);

	xfs_daddr_t		sector = xfs_fsb_to_db(ip, start_fsb);

	sector_t		block = XFS_BB_TO_FSBT(mp, sector);



	return blkdev_issue_zeroout(xfs_find_bdev_for_inode(VFS_I(ip)),

	return blkdev_issue_zeroout(target->bt_bdev,

		block << (mp->m_super->s_blocksize_bits - 9),

		count_fsb << (mp->m_super->s_blocksize_bits - 9),

		GFP_NOFS, 0);

fs/xfs/xfs_file.c

+7 −7
Original line number Diff line number Diff line
@@ -1229,22 +1229,22 @@ static const struct vm_operations_struct xfs_file_vm_ops = { 


STATIC int

xfs_file_mmap(

	struct file	*filp,

	struct file		*file,

	struct vm_area_struct	*vma)

{

	struct dax_device 	*dax_dev;

	struct inode		*inode = file_inode(file);

	struct xfs_buftarg	*target = xfs_inode_buftarg(XFS_I(inode));



	dax_dev = xfs_find_daxdev_for_inode(file_inode(filp));

	/*

	 * We don't support synchronous mappings for non-DAX files and

	 * for DAX files if underneath dax_device is not synchronous.

	 */

	if (!daxdev_mapping_supported(vma, dax_dev))

	if (!daxdev_mapping_supported(vma, target->bt_daxdev))

		return -EOPNOTSUPP;



	file_accessed(filp);

	file_accessed(file);

	vma->vm_ops = &xfs_file_vm_ops;

	if (IS_DAX(file_inode(filp)))

	if (IS_DAX(inode))

		vma->vm_flags |= VM_HUGEPAGE;

	return 0;

}

fs/xfs/xfs_inode.h

+7 −0
Original line number Diff line number Diff line
@@ -219,6 +219,13 @@ static inline bool xfs_inode_has_cow_data(struct xfs_inode *ip) 
	return ip->i_cowfp && ip->i_cowfp->if_bytes;

}



/*

 * Return the buftarg used for data allocations on a given inode.

 */

#define xfs_inode_buftarg(ip) \

	(XFS_IS_REALTIME_INODE(ip) ? \

		(ip)->i_mount->m_rtdev_targp : (ip)->i_mount->m_ddev_targp)



/*

 * In-core inode flags.

 */