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

Commit 5faaf4fa authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Dave Chinner
Browse files

xfs: merge xfs_reflink_remap_range and xfs_file_share_range 



There is no clear division of responsibility between those functions, so
just merge them into one to keep the code simple.  Also move
xfs_file_wait_for_io to xfs_reflink.c together with its only caller.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent ec407599

fs/xfs/xfs_file.c

+3 −129
Original line number Original line Diff line number Diff line
@@ -909,132 +909,6 @@ xfs_file_fallocate( 
	return error;

	return error;

}

}





/* Hook up to the VFS reflink function */

STATIC int

xfs_file_share_range(

	struct file	*file_in,

	loff_t		pos_in,

	struct file	*file_out,

	loff_t		pos_out,

	u64		len,

	bool		is_dedupe)

{

	struct inode	*inode_in;

	struct inode	*inode_out;

	ssize_t		ret;

	loff_t		bs;

	loff_t		isize;

	int		same_inode;

	loff_t		blen;

	unsigned int	flags = 0;



	inode_in = file_inode(file_in);

	inode_out = file_inode(file_out);

	bs = inode_out->i_sb->s_blocksize;



	/* Lock both files against IO */

	same_inode = (inode_in == inode_out);

	if (same_inode) {

		xfs_ilock(XFS_I(inode_in), XFS_IOLOCK_EXCL);

		xfs_ilock(XFS_I(inode_in), XFS_MMAPLOCK_EXCL);

	} else {

		xfs_lock_two_inodes(XFS_I(inode_in), XFS_I(inode_out),

				XFS_IOLOCK_EXCL);

		xfs_lock_two_inodes(XFS_I(inode_in), XFS_I(inode_out),

				XFS_MMAPLOCK_EXCL);

	}



	/* Don't touch certain kinds of inodes */

	ret = -EPERM;

	if (IS_IMMUTABLE(inode_out))

		goto out_unlock;

	ret = -ETXTBSY;

	if (IS_SWAPFILE(inode_in) || IS_SWAPFILE(inode_out))

		goto out_unlock;



	/* Don't reflink dirs, pipes, sockets... */

	ret = -EISDIR;

	if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))

		goto out_unlock;

	ret = -EINVAL;

	if (S_ISFIFO(inode_in->i_mode) || S_ISFIFO(inode_out->i_mode))

		goto out_unlock;

	if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode))

		goto out_unlock;



	/* Don't share DAX file data for now. */

	if (IS_DAX(inode_in) || IS_DAX(inode_out))

		goto out_unlock;



	/* Are we going all the way to the end? */

	isize = i_size_read(inode_in);

	if (isize == 0) {

		ret = 0;

		goto out_unlock;

	}



	if (len == 0)

		len = isize - pos_in;



	/* Ensure offsets don't wrap and the input is inside i_size */

	if (pos_in + len < pos_in || pos_out + len < pos_out ||

	    pos_in + len > isize)

		goto out_unlock;



	/* Don't allow dedupe past EOF in the dest file */

	if (is_dedupe) {

		loff_t	disize;



		disize = i_size_read(inode_out);

		if (pos_out >= disize || pos_out + len > disize)

			goto out_unlock;

	}



	/* If we're linking to EOF, continue to the block boundary. */

	if (pos_in + len == isize)

		blen = ALIGN(isize, bs) - pos_in;

	else

		blen = len;



	/* Only reflink if we're aligned to block boundaries */

	if (!IS_ALIGNED(pos_in, bs) || !IS_ALIGNED(pos_in + blen, bs) ||

	    !IS_ALIGNED(pos_out, bs) || !IS_ALIGNED(pos_out + blen, bs))

		goto out_unlock;



	/* Don't allow overlapped reflink within the same file */

	if (same_inode && pos_out + blen > pos_in && pos_out < pos_in + blen)

		goto out_unlock;



	/* Wait for the completion of any pending IOs on both files */

	inode_dio_wait(inode_in);

	if (!same_inode)

		inode_dio_wait(inode_out);



	ret = filemap_write_and_wait_range(inode_in->i_mapping,

			pos_in, pos_in + len - 1);

	if (ret)

		goto out_unlock;



	ret = filemap_write_and_wait_range(inode_out->i_mapping,

			pos_out, pos_out + len - 1);

	if (ret)

		goto out_unlock;



	if (is_dedupe)

		flags |= XFS_REFLINK_DEDUPE;

	ret = xfs_reflink_remap_range(XFS_I(inode_in), pos_in, XFS_I(inode_out),

			pos_out, len, flags);



out_unlock:

	xfs_iunlock(XFS_I(inode_in), XFS_MMAPLOCK_EXCL);

	xfs_iunlock(XFS_I(inode_in), XFS_IOLOCK_EXCL);

	if (!same_inode) {

		xfs_iunlock(XFS_I(inode_out), XFS_MMAPLOCK_EXCL);

		xfs_iunlock(XFS_I(inode_out), XFS_IOLOCK_EXCL);

	}

	return ret;

}



STATIC ssize_t

STATIC ssize_t

xfs_file_copy_range(

xfs_file_copy_range(

	struct file	*file_in,

	struct file	*file_in,
@@ -1046,7 +920,7 @@ xfs_file_copy_range( 
{

{

	int		error;

	int		error;





	error = xfs_file_share_range(file_in, pos_in, file_out, pos_out,

	error = xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out,

				     len, false);

				     len, false);

	if (error)

	if (error)

		return error;

		return error;
@@ -1061,7 +935,7 @@ xfs_file_clone_range( 
	loff_t		pos_out,

	loff_t		pos_out,

	u64		len)

	u64		len)

{

{

	return xfs_file_share_range(file_in, pos_in, file_out, pos_out,

	return xfs_reflink_remap_range(file_in, pos_in, file_out, pos_out,

				     len, false);

				     len, false);

}

}
@@ -1084,7 +958,7 @@ xfs_file_dedupe_range( 
	if (len > XFS_MAX_DEDUPE_LEN)

	if (len > XFS_MAX_DEDUPE_LEN)

		len = XFS_MAX_DEDUPE_LEN;

		len = XFS_MAX_DEDUPE_LEN;





	error = xfs_file_share_range(src_file, loff, dst_file, dst_loff,

	error = xfs_reflink_remap_range(src_file, loff, dst_file, dst_loff,

				     len, true);

				     len, true);

	if (error)

	if (error)

		return error;

		return error;

fs/xfs/xfs_reflink.c

+138 −40
Original line number Original line Diff line number Diff line
@@ -1312,19 +1312,26 @@ xfs_compare_extents( 
 */

 */

int

int

xfs_reflink_remap_range(

xfs_reflink_remap_range(

	struct xfs_inode	*src,

	struct file		*file_in,

	xfs_off_t		srcoff,

	loff_t			pos_in,

	struct xfs_inode	*dest,

	struct file		*file_out,

	xfs_off_t		destoff,

	loff_t			pos_out,

	xfs_off_t		len,

	u64			len,

	unsigned int		flags)

	bool			is_dedupe)

{

{

	struct inode		*inode_in = file_inode(file_in);

	struct xfs_inode	*src = XFS_I(inode_in);

	struct inode		*inode_out = file_inode(file_out);

	struct xfs_inode	*dest = XFS_I(inode_out);

	struct xfs_mount	*mp = src->i_mount;

	struct xfs_mount	*mp = src->i_mount;

	loff_t			bs = inode_out->i_sb->s_blocksize;

	bool			same_inode = (inode_in == inode_out);

	xfs_fileoff_t		sfsbno, dfsbno;

	xfs_fileoff_t		sfsbno, dfsbno;

	xfs_filblks_t		fsblen;

	xfs_filblks_t		fsblen;

	int			error;

	xfs_extlen_t		cowextsize;

	xfs_extlen_t		cowextsize;

	bool			is_same;

	loff_t			isize;

	ssize_t			ret;

	loff_t			blen;





	if (!xfs_sb_version_hasreflink(&mp->m_sb))

	if (!xfs_sb_version_hasreflink(&mp->m_sb))

		return -EOPNOTSUPP;

		return -EOPNOTSUPP;
@@ -1332,48 +1339,135 @@ xfs_reflink_remap_range( 
	if (XFS_FORCED_SHUTDOWN(mp))

	if (XFS_FORCED_SHUTDOWN(mp))

		return -EIO;

		return -EIO;





	/* Lock both files against IO */

	if (same_inode) {

		xfs_ilock(src, XFS_IOLOCK_EXCL);

		xfs_ilock(src, XFS_MMAPLOCK_EXCL);

	} else {

		xfs_lock_two_inodes(src, dest, XFS_IOLOCK_EXCL);

		xfs_lock_two_inodes(src, dest, XFS_MMAPLOCK_EXCL);

	}



	/* Don't touch certain kinds of inodes */

	ret = -EPERM;

	if (IS_IMMUTABLE(inode_out))

		goto out_unlock;



	ret = -ETXTBSY;

	if (IS_SWAPFILE(inode_in) || IS_SWAPFILE(inode_out))

		goto out_unlock;





	/* Don't reflink dirs, pipes, sockets... */

	ret = -EISDIR;

	if (S_ISDIR(inode_in->i_mode) || S_ISDIR(inode_out->i_mode))

		goto out_unlock;

	ret = -EINVAL;

	if (S_ISFIFO(inode_in->i_mode) || S_ISFIFO(inode_out->i_mode))

		goto out_unlock;

	if (!S_ISREG(inode_in->i_mode) || !S_ISREG(inode_out->i_mode))

		goto out_unlock;



	/* Don't reflink realtime inodes */

	/* Don't reflink realtime inodes */

	if (XFS_IS_REALTIME_INODE(src) || XFS_IS_REALTIME_INODE(dest))

	if (XFS_IS_REALTIME_INODE(src) || XFS_IS_REALTIME_INODE(dest))

		return -EINVAL;

		goto out_unlock;



	/* Don't share DAX file data for now. */

	if (IS_DAX(inode_in) || IS_DAX(inode_out))

		goto out_unlock;



	/* Are we going all the way to the end? */

	isize = i_size_read(inode_in);

	if (isize == 0) {

		ret = 0;

		goto out_unlock;

	}



	if (len == 0)

		len = isize - pos_in;



	/* Ensure offsets don't wrap and the input is inside i_size */

	if (pos_in + len < pos_in || pos_out + len < pos_out ||

	    pos_in + len > isize)

		goto out_unlock;



	/* Don't allow dedupe past EOF in the dest file */

	if (is_dedupe) {

		loff_t	disize;



		disize = i_size_read(inode_out);

		if (pos_out >= disize || pos_out + len > disize)

			goto out_unlock;

	}



	/* If we're linking to EOF, continue to the block boundary. */

	if (pos_in + len == isize)

		blen = ALIGN(isize, bs) - pos_in;

	else

		blen = len;



	/* Only reflink if we're aligned to block boundaries */

	if (!IS_ALIGNED(pos_in, bs) || !IS_ALIGNED(pos_in + blen, bs) ||

	    !IS_ALIGNED(pos_out, bs) || !IS_ALIGNED(pos_out + blen, bs))

		goto out_unlock;



	/* Don't allow overlapped reflink within the same file */

	if (same_inode) {

		if (pos_out + blen > pos_in && pos_out < pos_in + blen)

			goto out_unlock;

	}





	if (flags & ~XFS_REFLINK_ALL)

	/* Wait for the completion of any pending IOs on both files */

		return -EINVAL;

	inode_dio_wait(inode_in);

	if (!same_inode)

		inode_dio_wait(inode_out);





	trace_xfs_reflink_remap_range(src, srcoff, len, dest, destoff);

	ret = filemap_write_and_wait_range(inode_in->i_mapping,

			pos_in, pos_in + len - 1);

	if (ret)

		goto out_unlock;



	ret = filemap_write_and_wait_range(inode_out->i_mapping,

			pos_out, pos_out + len - 1);

	if (ret)

		goto out_unlock;



	trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out);





	/*

	/*

	 * Check that the extents are the same.

	 * Check that the extents are the same.

	 */

	 */

	if (flags & XFS_REFLINK_DEDUPE) {

	if (is_dedupe) {

		is_same = false;

		bool		is_same = false;

		error = xfs_compare_extents(VFS_I(src), srcoff, VFS_I(dest),



				destoff, len, &is_same);

		ret = xfs_compare_extents(inode_in, pos_in, inode_out, pos_out,

		if (error)

				len, &is_same);

			goto out_error;

		if (ret)

			goto out_unlock;

		if (!is_same) {

		if (!is_same) {

			error = -EBADE;

			ret = -EBADE;

			goto out_error;

			goto out_unlock;

		}

		}

	}

	}





	error = xfs_reflink_set_inode_flag(src, dest);

	ret = xfs_reflink_set_inode_flag(src, dest);

	if (error)

	if (ret)

		goto out_error;

		goto out_unlock;





	/*

	/*

	 * Invalidate the page cache so that we can clear any CoW mappings

	 * Invalidate the page cache so that we can clear any CoW mappings

	 * in the destination file.

	 * in the destination file.

	 */

	 */

	truncate_inode_pages_range(&VFS_I(dest)->i_data, destoff,

	truncate_inode_pages_range(&inode_out->i_data, pos_out,

				   PAGE_ALIGN(destoff + len) - 1);

				   PAGE_ALIGN(pos_out + len) - 1);





	dfsbno = XFS_B_TO_FSBT(mp, destoff);

	dfsbno = XFS_B_TO_FSBT(mp, pos_out);

	sfsbno = XFS_B_TO_FSBT(mp, srcoff);

	sfsbno = XFS_B_TO_FSBT(mp, pos_in);

	fsblen = XFS_B_TO_FSB(mp, len);

	fsblen = XFS_B_TO_FSB(mp, len);

	error = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen,

	ret = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen,

			destoff + len);

			pos_out + len);

	if (error)

	if (ret)

		goto out_error;

		goto out_unlock;





	/*

	/*

	 * Carry the cowextsize hint from src to dest if we're sharing the

	 * Carry the cowextsize hint from src to dest if we're sharing the
@@ -1381,20 +1475,24 @@ xfs_reflink_remap_range( 
	 * has a cowextsize hint, and the destination file does not.

	 * has a cowextsize hint, and the destination file does not.

	 */

	 */

	cowextsize = 0;

	cowextsize = 0;

	if (srcoff == 0 && len == i_size_read(VFS_I(src)) &&

	if (pos_in == 0 && len == i_size_read(inode_in) &&

	    (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) &&

	    (src->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) &&

	    destoff == 0 && len >= i_size_read(VFS_I(dest)) &&

	    pos_out == 0 && len >= i_size_read(inode_out) &&

	    !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE))

	    !(dest->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE))

		cowextsize = src->i_d.di_cowextsize;

		cowextsize = src->i_d.di_cowextsize;





	error = xfs_reflink_update_dest(dest, destoff + len, cowextsize);

	ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize);

	if (error)

		goto out_error;





out_error:

out_unlock:

	if (error)

	xfs_iunlock(src, XFS_MMAPLOCK_EXCL);

		trace_xfs_reflink_remap_range_error(dest, error, _RET_IP_);

	xfs_iunlock(src, XFS_IOLOCK_EXCL);

	return error;

	if (src->i_ino != dest->i_ino) {

		xfs_iunlock(dest, XFS_MMAPLOCK_EXCL);

		xfs_iunlock(dest, XFS_IOLOCK_EXCL);

	}

	if (ret)

		trace_xfs_reflink_remap_range_error(dest, ret, _RET_IP_);

	return ret;

}

}





/*

/*

fs/xfs/xfs_reflink.h

+2 −5
Original line number Original line Diff line number Diff line
@@ -43,11 +43,8 @@ extern int xfs_reflink_cancel_cow_range(struct xfs_inode *ip, xfs_off_t offset, 
extern int xfs_reflink_end_cow(struct xfs_inode *ip, xfs_off_t offset,

extern int xfs_reflink_end_cow(struct xfs_inode *ip, xfs_off_t offset,

		xfs_off_t count);

		xfs_off_t count);

extern int xfs_reflink_recover_cow(struct xfs_mount *mp);

extern int xfs_reflink_recover_cow(struct xfs_mount *mp);

#define XFS_REFLINK_DEDUPE	1	/* only reflink if contents match */

extern int xfs_reflink_remap_range(struct file *file_in, loff_t pos_in,

#define XFS_REFLINK_ALL		(XFS_REFLINK_DEDUPE)

		struct file *file_out, loff_t pos_out, u64 len, bool is_dedupe);

extern int xfs_reflink_remap_range(struct xfs_inode *src, xfs_off_t srcoff,

		struct xfs_inode *dest, xfs_off_t destoff, xfs_off_t len,

		unsigned int flags);

extern int xfs_reflink_clear_inode_flag(struct xfs_inode *ip,

extern int xfs_reflink_clear_inode_flag(struct xfs_inode *ip,

		struct xfs_trans **tpp);

		struct xfs_trans **tpp);

extern int xfs_reflink_unshare(struct xfs_inode *ip, xfs_off_t offset,

extern int xfs_reflink_unshare(struct xfs_inode *ip, xfs_off_t offset,