Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 862f1b9d authored by Ross Zwisler's avatar Ross Zwisler Committed by Dave Chinner
Browse files

xfs: use struct iomap based DAX PMD fault path 



Switch xfs_filemap_pmd_fault() from using dax_pmd_fault() to the new and
improved dax_iomap_pmd_fault().  Also, now that it has no more users,
remove xfs_get_blocks_dax_fault().

Signed-off-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 642261ac

fs/xfs/xfs_aops.c

+5 −21
Original line number Diff line number Diff line
@@ -1298,8 +1298,7 @@ __xfs_get_blocks( 
	sector_t		iblock,

	struct buffer_head	*bh_result,

	int			create,

	bool			direct,

	bool			dax_fault)

	bool			direct)

{

	struct xfs_inode	*ip = XFS_I(inode);

	struct xfs_mount	*mp = ip->i_mount;
@@ -1420,13 +1419,8 @@ __xfs_get_blocks( 
		if (ISUNWRITTEN(&imap))

			set_buffer_unwritten(bh_result);

		/* direct IO needs special help */

		if (create) {

			if (dax_fault)

				ASSERT(!ISUNWRITTEN(&imap));

			else

				xfs_map_direct(inode, bh_result, &imap, offset,

						is_cow);

		}

		if (create)

			xfs_map_direct(inode, bh_result, &imap, offset, is_cow);

	}



	/*
@@ -1466,7 +1460,7 @@ xfs_get_blocks( 
	struct buffer_head	*bh_result,

	int			create)

{

	return __xfs_get_blocks(inode, iblock, bh_result, create, false, false);

	return __xfs_get_blocks(inode, iblock, bh_result, create, false);

}



int
@@ -1476,17 +1470,7 @@ xfs_get_blocks_direct( 
	struct buffer_head	*bh_result,

	int			create)

{

	return __xfs_get_blocks(inode, iblock, bh_result, create, true, false);

}



int

xfs_get_blocks_dax_fault(

	struct inode		*inode,

	sector_t		iblock,

	struct buffer_head	*bh_result,

	int			create)

{

	return __xfs_get_blocks(inode, iblock, bh_result, create, true, true);

	return __xfs_get_blocks(inode, iblock, bh_result, create, true);

}



/*

fs/xfs/xfs_aops.h

+0 −3
Original line number Diff line number Diff line
@@ -59,9 +59,6 @@ int xfs_get_blocks(struct inode *inode, sector_t offset, 
		       struct buffer_head *map_bh, int create);

int	xfs_get_blocks_direct(struct inode *inode, sector_t offset,

			      struct buffer_head *map_bh, int create);

int	xfs_get_blocks_dax_fault(struct inode *inode, sector_t offset,

			         struct buffer_head *map_bh, int create);



int	xfs_end_io_direct_write(struct kiocb *iocb, loff_t offset,

		ssize_t size, void *private);

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

fs/xfs/xfs_file.c

+1 −1
Original line number Diff line number Diff line
@@ -1711,7 +1711,7 @@ xfs_filemap_pmd_fault( 
	}



	xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED);

	ret = dax_pmd_fault(vma, addr, pmd, flags, xfs_get_blocks_dax_fault);

	ret = dax_iomap_pmd_fault(vma, addr, pmd, flags, &xfs_iomap_ops);

	xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED);



	if (flags & FAULT_FLAG_WRITE)