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

Commit 65f098e9 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Dave Chinner
Browse files

ocfs2: remove ocfs2_reflink_remap_range 



Since ocfs2_remap_file_range is a thin shell around
ocfs2_remap_remap_range, move everything from the latter into the
former.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Signed-off-by: default avatarDave Chinner <david@fromorbit.com>
parent 900611a1

fs/ocfs2/file.c

+66 −2
Original line number Diff line number Diff line
@@ -2531,11 +2531,75 @@ static loff_t ocfs2_remap_file_range(struct file *file_in, loff_t pos_in, 
				     struct file *file_out, loff_t pos_out,

				     loff_t len, unsigned int remap_flags)

{

	struct inode *inode_in = file_inode(file_in);

	struct inode *inode_out = file_inode(file_out);

	struct ocfs2_super *osb = OCFS2_SB(inode_in->i_sb);

	struct buffer_head *in_bh = NULL, *out_bh = NULL;

	bool same_inode = (inode_in == inode_out);

	loff_t remapped = 0;

	ssize_t ret;



	if (remap_flags & ~(REMAP_FILE_DEDUP | REMAP_FILE_ADVISORY))

		return -EINVAL;

	if (!ocfs2_refcount_tree(osb))

		return -EOPNOTSUPP;

	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))

		return -EROFS;



	/* Lock both files against IO */

	ret = ocfs2_reflink_inodes_lock(inode_in, &in_bh, inode_out, &out_bh);

	if (ret)

		return ret;



	/* Check file eligibility and prepare for block sharing. */

	ret = -EINVAL;

	if ((OCFS2_I(inode_in)->ip_flags & OCFS2_INODE_SYSTEM_FILE) ||

	    (OCFS2_I(inode_out)->ip_flags & OCFS2_INODE_SYSTEM_FILE))

		goto out_unlock;



	ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,

			&len, remap_flags);

	if (ret < 0 || len == 0)

		goto out_unlock;



	return ocfs2_reflink_remap_range(file_in, pos_in, file_out, pos_out,

			len, remap_flags);

	/* Lock out changes to the allocation maps and remap. */

	down_write(&OCFS2_I(inode_in)->ip_alloc_sem);

	if (!same_inode)

		down_write_nested(&OCFS2_I(inode_out)->ip_alloc_sem,

				  SINGLE_DEPTH_NESTING);



	/* Zap any page cache for the destination file's range. */

	truncate_inode_pages_range(&inode_out->i_data,

				   round_down(pos_out, PAGE_SIZE),

				   round_up(pos_out + len, PAGE_SIZE) - 1);



	remapped = ocfs2_reflink_remap_blocks(inode_in, in_bh, pos_in,

			inode_out, out_bh, pos_out, len);

	up_write(&OCFS2_I(inode_in)->ip_alloc_sem);

	if (!same_inode)

		up_write(&OCFS2_I(inode_out)->ip_alloc_sem);

	if (remapped < 0) {

		ret = remapped;

		mlog_errno(ret);

		goto out_unlock;

	}



	/*

	 * Empty the extent map so that we may get the right extent

	 * record from the disk.

	 */

	ocfs2_extent_map_trunc(inode_in, 0);

	ocfs2_extent_map_trunc(inode_out, 0);



	ret = ocfs2_reflink_update_dest(inode_out, out_bh, pos_out + len);

	if (ret) {

		mlog_errno(ret);

		goto out_unlock;

	}



out_unlock:

	ocfs2_reflink_inodes_unlock(inode_in, in_bh, inode_out, out_bh);

	return remapped > 0 ? remapped : ret;

}



const struct inode_operations ocfs2_file_iops = {

fs/ocfs2/refcounttree.c

+18 −95
Original line number Diff line number Diff line
@@ -4468,7 +4468,7 @@ int ocfs2_reflink_ioctl(struct inode *inode, 
}



/* Update destination inode size, if necessary. */

static int ocfs2_reflink_update_dest(struct inode *dest,

int ocfs2_reflink_update_dest(struct inode *dest,

			      struct buffer_head *d_bh,

			      loff_t newlen)

{
@@ -4621,7 +4621,7 @@ static loff_t ocfs2_reflink_remap_extent(struct inode *s_inode, 
}



/* Set up refcount tree and remap s_inode to t_inode. */

static loff_t ocfs2_reflink_remap_blocks(struct inode *s_inode,

loff_t ocfs2_reflink_remap_blocks(struct inode *s_inode,

				  struct buffer_head *s_bh,

				  loff_t pos_in,

				  struct inode *t_inode,
@@ -4720,7 +4720,7 @@ static loff_t ocfs2_reflink_remap_blocks(struct inode *s_inode, 
}



/* Lock an inode and grab a bh pointing to the inode. */

static int ocfs2_reflink_inodes_lock(struct inode *s_inode,

int ocfs2_reflink_inodes_lock(struct inode *s_inode,

			      struct buffer_head **bh1,

			      struct inode *t_inode,

			      struct buffer_head **bh2)
@@ -4808,7 +4808,7 @@ static int ocfs2_reflink_inodes_lock(struct inode *s_inode, 
}



/* Unlock both inodes and release buffers. */

static void ocfs2_reflink_inodes_unlock(struct inode *s_inode,

void ocfs2_reflink_inodes_unlock(struct inode *s_inode,

				 struct buffer_head *s_bh,

				 struct inode *t_inode,

				 struct buffer_head *t_bh)
@@ -4823,80 +4823,3 @@ static void ocfs2_reflink_inodes_unlock(struct inode *s_inode, 
	}

	unlock_two_nondirectories(s_inode, t_inode);

}
 


/* Link a range of blocks from one file to another. */

loff_t ocfs2_reflink_remap_range(struct file *file_in,

				 loff_t pos_in,

				 struct file *file_out,

				 loff_t pos_out,

				 loff_t len,

				 unsigned int remap_flags)

{

	struct inode *inode_in = file_inode(file_in);

	struct inode *inode_out = file_inode(file_out);

	struct ocfs2_super *osb = OCFS2_SB(inode_in->i_sb);

	struct buffer_head *in_bh = NULL, *out_bh = NULL;

	bool same_inode = (inode_in == inode_out);

	loff_t remapped = 0;

	ssize_t ret;



	if (!ocfs2_refcount_tree(osb))

		return -EOPNOTSUPP;

	if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))

		return -EROFS;



	/* Lock both files against IO */

	ret = ocfs2_reflink_inodes_lock(inode_in, &in_bh, inode_out, &out_bh);

	if (ret)

		return ret;



	/* Check file eligibility and prepare for block sharing. */

	ret = -EINVAL;

	if ((OCFS2_I(inode_in)->ip_flags & OCFS2_INODE_SYSTEM_FILE) ||

	    (OCFS2_I(inode_out)->ip_flags & OCFS2_INODE_SYSTEM_FILE))

		goto out_unlock;



	ret = generic_remap_file_range_prep(file_in, pos_in, file_out, pos_out,

			&len, remap_flags);

	if (ret < 0 || len == 0)

		goto out_unlock;



	/* Lock out changes to the allocation maps and remap. */

	down_write(&OCFS2_I(inode_in)->ip_alloc_sem);

	if (!same_inode)

		down_write_nested(&OCFS2_I(inode_out)->ip_alloc_sem,

				  SINGLE_DEPTH_NESTING);



	/* Zap any page cache for the destination file's range. */

	truncate_inode_pages_range(&inode_out->i_data,

				   round_down(pos_out, PAGE_SIZE),

				   round_up(pos_out + len, PAGE_SIZE) - 1);



	remapped = ocfs2_reflink_remap_blocks(inode_in, in_bh, pos_in,

			inode_out, out_bh, pos_out, len);

	up_write(&OCFS2_I(inode_in)->ip_alloc_sem);

	if (!same_inode)

		up_write(&OCFS2_I(inode_out)->ip_alloc_sem);

	if (remapped < 0) {

		ret = remapped;

		mlog_errno(ret);

		goto out_unlock;

	}



	/*

	 * Empty the extent map so that we may get the right extent

	 * record from the disk.

	 */

	ocfs2_extent_map_trunc(inode_in, 0);

	ocfs2_extent_map_trunc(inode_out, 0);



	ret = ocfs2_reflink_update_dest(inode_out, out_bh, pos_out + len);

	if (ret) {

		mlog_errno(ret);

		goto out_unlock;

	}



out_unlock:

	ocfs2_reflink_inodes_unlock(inode_in, in_bh, inode_out, out_bh);

	return remapped > 0 ? remapped : ret;

}

fs/ocfs2/refcounttree.h

+18 −6
Original line number Diff line number Diff line
@@ -115,11 +115,23 @@ int ocfs2_reflink_ioctl(struct inode *inode, 
			const char __user *oldname,

			const char __user *newname,

			bool preserve);

loff_t ocfs2_reflink_remap_range(struct file *file_in,

loff_t ocfs2_reflink_remap_blocks(struct inode *s_inode,

				  struct buffer_head *s_bh,

				  loff_t pos_in,

				 struct file *file_out,

				  struct inode *t_inode,

				  struct buffer_head *t_bh,

				  loff_t pos_out,

				 loff_t len,

				 unsigned int remap_flags);

				  loff_t len);

int ocfs2_reflink_inodes_lock(struct inode *s_inode,

			      struct buffer_head **bh1,

			      struct inode *t_inode,

			      struct buffer_head **bh2);

void ocfs2_reflink_inodes_unlock(struct inode *s_inode,

				 struct buffer_head *s_bh,

				 struct inode *t_inode,

				 struct buffer_head *t_bh);

int ocfs2_reflink_update_dest(struct inode *dest,

			      struct buffer_head *d_bh,

			      loff_t newlen);



#endif /* OCFS2_REFCOUNTTREE_H */