Commit a4db266a authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: move inode lease breaking functions to xfs_inode.c 



The lease breaking functions operate at the scope of the entire VFS
inode, not subranges of a file.  Move them to xfs_inode.c since they're
already declared in xfs_inode.h.  This cleanup moves us closer to
having xfs_FOO.h declare only the symbols in xfs_FOO.c.

Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
parent 5302a5c8

fs/xfs/xfs_file.c

+0 −61
Original line number Diff line number Diff line
@@ -861,67 +861,6 @@ xfs_file_write_iter( 
	return xfs_file_buffered_write(iocb, from);

}



static void

xfs_wait_dax_page(

	struct inode		*inode)

{

	struct xfs_inode        *ip = XFS_I(inode);



	xfs_iunlock(ip, XFS_MMAPLOCK_EXCL);

	schedule();

	xfs_ilock(ip, XFS_MMAPLOCK_EXCL);

}



int

xfs_break_dax_layouts(

	struct inode		*inode,

	bool			*retry)

{

	struct page		*page;



	xfs_assert_ilocked(XFS_I(inode), XFS_MMAPLOCK_EXCL);



	page = dax_layout_busy_page(inode->i_mapping);

	if (!page)

		return 0;



	*retry = true;

	return ___wait_var_event(&page->_refcount,

			atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE,

			0, 0, xfs_wait_dax_page(inode));

}



int

xfs_break_layouts(

	struct inode		*inode,

	uint			*iolock,

	enum layout_break_reason reason)

{

	bool			retry;

	int			error;



	xfs_assert_ilocked(XFS_I(inode), XFS_IOLOCK_SHARED | XFS_IOLOCK_EXCL);



	do {

		retry = false;

		switch (reason) {

		case BREAK_UNMAP:

			error = xfs_break_dax_layouts(inode, &retry);

			if (error || retry)

				break;

			fallthrough;

		case BREAK_WRITE:

			error = xfs_break_leased_layouts(inode, iolock, &retry);

			break;

		default:

			WARN_ON_ONCE(1);

			error = -EINVAL;

		}

	} while (error == 0 && retry);



	return error;

}



/* Does this file, inode, or mount want synchronous writes? */

static inline bool xfs_file_sync_writes(struct file *filp)

{

fs/xfs/xfs_inode.c

+62 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "xfs_ag.h"

#include "xfs_log_priv.h"

#include "xfs_health.h"

#include "xfs_pnfs.h"



struct kmem_cache *xfs_inode_cache;
@@ -3946,3 +3947,64 @@ xfs_inode_count_blocks( 
		xfs_bmap_count_leaves(ifp, rblocks);

	*dblocks = ip->i_nblocks - *rblocks;

}



static void

xfs_wait_dax_page(

	struct inode		*inode)

{

	struct xfs_inode        *ip = XFS_I(inode);



	xfs_iunlock(ip, XFS_MMAPLOCK_EXCL);

	schedule();

	xfs_ilock(ip, XFS_MMAPLOCK_EXCL);

}



int

xfs_break_dax_layouts(

	struct inode		*inode,

	bool			*retry)

{

	struct page		*page;



	xfs_assert_ilocked(XFS_I(inode), XFS_MMAPLOCK_EXCL);



	page = dax_layout_busy_page(inode->i_mapping);

	if (!page)

		return 0;



	*retry = true;

	return ___wait_var_event(&page->_refcount,

			atomic_read(&page->_refcount) == 1, TASK_INTERRUPTIBLE,

			0, 0, xfs_wait_dax_page(inode));

}



int

xfs_break_layouts(

	struct inode		*inode,

	uint			*iolock,

	enum layout_break_reason reason)

{

	bool			retry;

	int			error;



	xfs_assert_ilocked(XFS_I(inode), XFS_IOLOCK_SHARED | XFS_IOLOCK_EXCL);



	do {

		retry = false;

		switch (reason) {

		case BREAK_UNMAP:

			error = xfs_break_dax_layouts(inode, &retry);

			if (error || retry)

				break;

			fallthrough;

		case BREAK_WRITE:

			error = xfs_break_leased_layouts(inode, iolock, &retry);

			break;

		default:

			WARN_ON_ONCE(1);

			error = -EINVAL;

		}

	} while (error == 0 && retry);



	return error;

}

fs/xfs/xfs_inode.h

+0 −1
Original line number Diff line number Diff line
@@ -565,7 +565,6 @@ xfs_itruncate_extents( 
	return xfs_itruncate_extents_flags(tpp, ip, whichfork, new_size, 0);

}



/* from xfs_file.c */

int	xfs_break_dax_layouts(struct inode *inode, bool *retry);

int	xfs_break_layouts(struct inode *inode, uint *iolock,

		enum layout_break_reason reason);