Commit 9092b1de authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Chandan Babu R
Browse files

xfs: simplify xfs_dax_fault 



Replace the separate stub with an IS_ENABLED check, and take the call to
dax_finish_sync_fault into xfs_dax_fault instead of leaving it in the
caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandanbabu@kernel.org>
parent 29bc0dd0

fs/xfs/xfs_file.c

+13 −21
Original line number Diff line number Diff line
@@ -1251,31 +1251,27 @@ xfs_file_llseek( 
	return vfs_setpos(file, offset, inode->i_sb->s_maxbytes);

}



#ifdef CONFIG_FS_DAX

static inline vm_fault_t

xfs_dax_fault(

	struct vm_fault		*vmf,

	unsigned int		order,

	bool			write_fault,

	pfn_t			*pfn)

	bool			write_fault)

{

	return dax_iomap_fault(vmf, order, pfn, NULL,

	vm_fault_t		ret;

	pfn_t			pfn;



	if (!IS_ENABLED(CONFIG_FS_DAX)) {

		ASSERT(0);

		return VM_FAULT_SIGBUS;

	}

	ret = dax_iomap_fault(vmf, order, &pfn, NULL,

			(write_fault && !vmf->cow_page) ?

				&xfs_dax_write_iomap_ops :

				&xfs_read_iomap_ops);

	if (ret & VM_FAULT_NEEDDSYNC)

		ret = dax_finish_sync_fault(vmf, order, pfn);

	return ret;

}

#else

static inline vm_fault_t

xfs_dax_fault(

	struct vm_fault		*vmf,

	unsigned int		order,

	bool			write_fault,

	pfn_t			*pfn)

{

	ASSERT(0);

	return VM_FAULT_SIGBUS;

}

#endif



/*

 * Locking for serialisation of IO during page faults. This results in a lock
@@ -1309,11 +1305,7 @@ __xfs_filemap_fault( 
		lock_mode = xfs_ilock_for_write_fault(XFS_I(inode));



	if (IS_DAX(inode)) {

		pfn_t pfn;



		ret = xfs_dax_fault(vmf, order, write_fault, &pfn);

		if (ret & VM_FAULT_NEEDDSYNC)

			ret = dax_finish_sync_fault(vmf, order, pfn);

		ret = xfs_dax_fault(vmf, order, write_fault);

	} else if (write_fault) {

		ret = iomap_page_mkwrite(vmf, &xfs_page_mkwrite_iomap_ops);

	} else {