All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org,
	linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org,
	linux-xfs@vger.kernel.org, linux-mm@kvack.org,
	linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	ocfs2-devel@oss.oracle.com
Subject: [PATCH 24/28] xfs: clean up xfs_reflink_remap_blocks call site
Date: Sun, 21 Oct 2018 09:17:50 -0700	[thread overview]
Message-ID: <154013867045.29026.12266020817835171751.stgit@magnolia> (raw)
In-Reply-To: <154013850285.29026.16168387526580596209.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

Move the offset <-> blocks unit conversions into
xfs_reflink_remap_blocks to make the call site less ugly.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/xfs/xfs_reflink.c |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)


diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index e8e86646bb4b..79dec457f7fb 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1119,16 +1119,23 @@ xfs_reflink_remap_extent(
 STATIC int
 xfs_reflink_remap_blocks(
 	struct xfs_inode	*src,
-	xfs_fileoff_t		srcoff,
+	loff_t			pos_in,
 	struct xfs_inode	*dest,
-	xfs_fileoff_t		destoff,
-	xfs_filblks_t		len,
-	xfs_off_t		new_isize)
+	loff_t			pos_out,
+	loff_t			remap_len)
 {
 	struct xfs_bmbt_irec	imap;
+	xfs_fileoff_t		srcoff;
+	xfs_fileoff_t		destoff;
+	xfs_filblks_t		len;
+	xfs_filblks_t		range_len;
+	xfs_off_t		new_isize = pos_out + remap_len;
 	int			nimaps;
 	int			error = 0;
-	xfs_filblks_t		range_len;
+
+	destoff = XFS_B_TO_FSBT(src->i_mount, pos_out);
+	srcoff = XFS_B_TO_FSBT(src->i_mount, pos_in);
+	len = XFS_B_TO_FSB(src->i_mount, remap_len);
 
 	/* drange = (destoff, destoff + len); srange = (srcoff, srcoff + len) */
 	while (len) {
@@ -1143,7 +1150,7 @@ xfs_reflink_remap_blocks(
 		error = xfs_bmapi_read(src, srcoff, len, &imap, &nimaps, 0);
 		xfs_iunlock(src, lock_mode);
 		if (error)
-			goto err;
+			break;
 		ASSERT(nimaps == 1);
 
 		trace_xfs_reflink_remap_imap(src, srcoff, len, XFS_IO_OVERWRITE,
@@ -1157,11 +1164,11 @@ xfs_reflink_remap_blocks(
 		error = xfs_reflink_remap_extent(dest, &imap, destoff,
 				new_isize);
 		if (error)
-			goto err;
+			break;
 
 		if (fatal_signal_pending(current)) {
 			error = -EINTR;
-			goto err;
+			break;
 		}
 
 		/* Advance drange/srange */
@@ -1170,10 +1177,8 @@ xfs_reflink_remap_blocks(
 		len -= range_len;
 	}
 
-	return 0;
-
-err:
-	trace_xfs_reflink_remap_blocks_error(dest, error, _RET_IP_);
+	if (error)
+		trace_xfs_reflink_remap_blocks_error(dest, error, _RET_IP_);
 	return error;
 }
 
@@ -1396,8 +1401,6 @@ xfs_reflink_remap_range(
 	struct inode		*inode_out = file_inode(file_out);
 	struct xfs_inode	*dest = XFS_I(inode_out);
 	struct xfs_mount	*mp = src->i_mount;
-	xfs_fileoff_t		sfsbno, dfsbno;
-	xfs_filblks_t		fsblen;
 	xfs_extlen_t		cowextsize;
 	ssize_t			ret;
 
@@ -1415,11 +1418,7 @@ xfs_reflink_remap_range(
 
 	trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out);
 
-	dfsbno = XFS_B_TO_FSBT(mp, pos_out);
-	sfsbno = XFS_B_TO_FSBT(mp, pos_in);
-	fsblen = XFS_B_TO_FSB(mp, len);
-	ret = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen,
-			pos_out + len);
+	ret = xfs_reflink_remap_blocks(src, pos_in, dest, pos_out, len);
 	if (ret)
 		goto out_unlock;
 

WARNING: multiple messages have this Message-ID
From: Darrick J. Wong <darrick.wong@oracle.com>
To: david@fromorbit.com, darrick.wong@oracle.com
Cc: sandeen@redhat.com, linux-nfs@vger.kernel.org,
	linux-cifs@vger.kernel.org, linux-unionfs@vger.kernel.org,
	linux-xfs@vger.kernel.org, linux-mm@kvack.org,
	linux-btrfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	ocfs2-devel@oss.oracle.com
Subject: [Ocfs2-devel] [PATCH 24/28] xfs: clean up xfs_reflink_remap_blocks call site
Date: Sun, 21 Oct 2018 09:17:50 -0700	[thread overview]
Message-ID: <154013867045.29026.12266020817835171751.stgit@magnolia> (raw)
In-Reply-To: <154013850285.29026.16168387526580596209.stgit@magnolia>

From: Darrick J. Wong <darrick.wong@oracle.com>

Move the offset <-> blocks unit conversions into
xfs_reflink_remap_blocks to make the call site less ugly.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 fs/xfs/xfs_reflink.c |   37 ++++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 19 deletions(-)


diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index e8e86646bb4b..79dec457f7fb 100644
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -1119,16 +1119,23 @@ xfs_reflink_remap_extent(
 STATIC int
 xfs_reflink_remap_blocks(
 	struct xfs_inode	*src,
-	xfs_fileoff_t		srcoff,
+	loff_t			pos_in,
 	struct xfs_inode	*dest,
-	xfs_fileoff_t		destoff,
-	xfs_filblks_t		len,
-	xfs_off_t		new_isize)
+	loff_t			pos_out,
+	loff_t			remap_len)
 {
 	struct xfs_bmbt_irec	imap;
+	xfs_fileoff_t		srcoff;
+	xfs_fileoff_t		destoff;
+	xfs_filblks_t		len;
+	xfs_filblks_t		range_len;
+	xfs_off_t		new_isize = pos_out + remap_len;
 	int			nimaps;
 	int			error = 0;
-	xfs_filblks_t		range_len;
+
+	destoff = XFS_B_TO_FSBT(src->i_mount, pos_out);
+	srcoff = XFS_B_TO_FSBT(src->i_mount, pos_in);
+	len = XFS_B_TO_FSB(src->i_mount, remap_len);
 
 	/* drange = (destoff, destoff + len); srange = (srcoff, srcoff + len) */
 	while (len) {
@@ -1143,7 +1150,7 @@ xfs_reflink_remap_blocks(
 		error = xfs_bmapi_read(src, srcoff, len, &imap, &nimaps, 0);
 		xfs_iunlock(src, lock_mode);
 		if (error)
-			goto err;
+			break;
 		ASSERT(nimaps == 1);
 
 		trace_xfs_reflink_remap_imap(src, srcoff, len, XFS_IO_OVERWRITE,
@@ -1157,11 +1164,11 @@ xfs_reflink_remap_blocks(
 		error = xfs_reflink_remap_extent(dest, &imap, destoff,
 				new_isize);
 		if (error)
-			goto err;
+			break;
 
 		if (fatal_signal_pending(current)) {
 			error = -EINTR;
-			goto err;
+			break;
 		}
 
 		/* Advance drange/srange */
@@ -1170,10 +1177,8 @@ xfs_reflink_remap_blocks(
 		len -= range_len;
 	}
 
-	return 0;
-
-err:
-	trace_xfs_reflink_remap_blocks_error(dest, error, _RET_IP_);
+	if (error)
+		trace_xfs_reflink_remap_blocks_error(dest, error, _RET_IP_);
 	return error;
 }
 
@@ -1396,8 +1401,6 @@ xfs_reflink_remap_range(
 	struct inode		*inode_out = file_inode(file_out);
 	struct xfs_inode	*dest = XFS_I(inode_out);
 	struct xfs_mount	*mp = src->i_mount;
-	xfs_fileoff_t		sfsbno, dfsbno;
-	xfs_filblks_t		fsblen;
 	xfs_extlen_t		cowextsize;
 	ssize_t			ret;
 
@@ -1415,11 +1418,7 @@ xfs_reflink_remap_range(
 
 	trace_xfs_reflink_remap_range(src, pos_in, len, dest, pos_out);
 
-	dfsbno = XFS_B_TO_FSBT(mp, pos_out);
-	sfsbno = XFS_B_TO_FSBT(mp, pos_in);
-	fsblen = XFS_B_TO_FSB(mp, len);
-	ret = xfs_reflink_remap_blocks(src, sfsbno, dest, dfsbno, fsblen,
-			pos_out + len);
+	ret = xfs_reflink_remap_blocks(src, pos_in, dest, pos_out, len);
 	if (ret)
 		goto out_unlock;
 

  parent reply	other threads:[~2018-10-21 16:17 UTC|newest]

Thread overview: 83+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-21 16:15 [Ocfs2-devel] [PATCH v6 00/28] fs: fixes for serious clone/dedupe problems Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 01/28] vfs: vfs_clone_file_prep_inodes should return EINVAL for a clone from beyond EOF Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 02/28] vfs: check file ranges before cloning files Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 03/28] vfs: exit early from zero length remap operations Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 04/28] vfs: strengthen checking of file range inputs to generic_remap_checks Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 05/28] vfs: avoid problematic remapping requests into partial EOF block Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 06/28] vfs: skip zero-length dedupe requests Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 07/28] vfs: rename vfs_clone_file_prep to be more descriptive Darrick J. Wong
2018-10-21 16:15 ` [Ocfs2-devel] [PATCH 08/28] vfs: rename clone_verify_area to remap_verify_area Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 09/28] vfs: combine the clone and dedupe into a single remap_file_range Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 10/28] vfs: pass remap flags to generic_remap_file_range_prep Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 11/28] vfs: pass remap flags to generic_remap_checks Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 12/28] vfs: remap helper should update destination inode metadata Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 13/28] vfs: make remap_file_range functions take and return bytes completed Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 14/28] vfs: plumb remap flags through the vfs clone functions Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 15/28] vfs: plumb remap flags through the vfs dedupe functions Darrick J. Wong
2018-10-21 16:16 ` [Ocfs2-devel] [PATCH 16/28] vfs: enable remap callers that can handle short operations Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 17/28] vfs: hide file range comparison function Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 18/28] vfs: clean up generic_remap_file_range_prep return value Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 19/28] ocfs2: truncate page cache for clone destination file before remapping Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 20/28] ocfs2: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 21/28] ocfs2: support partial clone range and dedupe range Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 22/28] ocfs2: remove ocfs2_reflink_remap_range Darrick J. Wong
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 23/28] xfs: fix pagecache truncation prior to reflink Darrick J. Wong
2018-10-21 16:17 ` Darrick J. Wong [this message]
2018-10-22  2:11   ` [Ocfs2-devel] [PATCH 24/28] xfs: clean up xfs_reflink_remap_blocks call site Dave Chinner
2018-10-21 16:17 ` [Ocfs2-devel] [PATCH 25/28] xfs: support returning partial reflink results Darrick J. Wong
2018-10-22  2:14   ` Dave Chinner
2018-10-21 16:18 ` [Ocfs2-devel] [PATCH 26/28] xfs: remove redundant remap partial EOF block checks Darrick J. Wong
2018-10-21 16:18 ` [Ocfs2-devel] [PATCH 27/28] xfs: remove xfs_reflink_remap_range Darrick J. Wong
2018-10-22  2:17   ` Dave Chinner
2018-10-21 16:18 ` [Ocfs2-devel] [PATCH 28/28] xfs: remove [cm]time update from reflink calls Darrick J. Wong
2018-10-22  2:18   ` Dave Chinner
2018-10-22  2:21 ` [Ocfs2-devel] [PATCH v6 00/28] fs: fixes for serious clone/dedupe problems Dave Chinner
2018-10-22  4:37   ` Dave Chinner
2018-10-22  4:52     ` Al Viro
2018-10-22  5:08       ` Dave Chinner
2018-10-22  5:42         ` Amir Goldstein
2018-10-22  6:55           ` [Ocfs2-devel] " Dave Chinner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=154013867045.29026.12266020817835171751.stgit@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=david@fromorbit.com \
    --cc=linux-btrfs@vger.kernel.org \
    --cc=linux-cifs@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-nfs@vger.kernel.org \
    --cc=linux-unionfs@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=ocfs2-devel@oss.oracle.com \
    --cc=sandeen@redhat.com \
    --subject='Re: [PATCH 24/28] xfs: clean up xfs_reflink_remap_blocks call site' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.