linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Anna Schumaker <Anna.Schumaker@Netapp.com>
To: <fstests@vger.kernel.org>
Cc: <Anna.Schumaker@Netapp.com>, <linux-nfs@vger.kernel.org>,
	<hch@infradead.org>
Subject: [PATCH v4 6/5] xfs_io: Improvements to copy_range return code handling
Date: Thu, 8 Dec 2016 13:49:09 -0500	[thread overview]
Message-ID: <20161208184909.23321-7-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <20161208184909.23321-1-Anna.Schumaker@Netapp.com>

If copy_file_range() returns 0, then that means no data was copied.  We
should break out of the loop in this case to prevent looping
indefinitely.

Additionally, if an error is returned by copy_file_range() then we need
to print out the string form to be used by error checking tests in
xfstests.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
 io/copy_file_range.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/io/copy_file_range.c b/io/copy_file_range.c
index eddc634..161bdcf 100644
--- a/io/copy_file_range.c
+++ b/io/copy_file_range.c
@@ -49,8 +49,11 @@ copy_file_range(int fd, loff_t *src, loff_t *dst, size_t len)
 
 	do {
 		ret = syscall(__NR_copy_file_range, fd, src, file->fd, dst, len, 0);
-		if (ret == -1)
+		if (ret == -1) {
+			fprintf(stderr, _("copy_range: %s\n"), strerror(errno));
 			return errno;
+		} else if (ret == 0)
+			break;
 		len -= ret;
 	} while (len > 0);
 
-- 
2.10.2


  parent reply	other threads:[~2016-12-08 18:49 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-08 18:49 [PATCH v4 0/5] Add copy_file_range() tests Anna Schumaker
2016-12-08 18:49 ` [PATCH v4 1/5] generic/392: Add copy to new file test Anna Schumaker
2016-12-19 10:04   ` Eryu Guan
2016-12-19 22:34     ` Darrick J. Wong
2016-12-20  3:26       ` Eryu Guan
2016-12-08 18:49 ` [PATCH v4 2/5] generic/393: Add small copies " Anna Schumaker
2016-12-08 18:49 ` [PATCH v4 3/5] generic/394: Add copy test that overwrites data Anna Schumaker
2016-12-08 18:49 ` [PATCH v4 4/5] generic/395: Add a copy test for overwriting small amounts of data Anna Schumaker
2016-12-08 18:49 ` [PATCH v4 5/5] generic/396: Add a copy test for invalid input Anna Schumaker
2016-12-08 20:20   ` Darrick J. Wong
2016-12-08 20:28     ` Anna Schumaker
2016-12-08 18:49 ` Anna Schumaker [this message]
2016-12-11  9:03 ` [PATCH v4 0/5] Add copy_file_range() tests Amir Goldstein
2016-12-11 18:34   ` Darrick J. Wong

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=20161208184909.23321-7-Anna.Schumaker@Netapp.com \
    --to=anna.schumaker@netapp.com \
    --cc=fstests@vger.kernel.org \
    --cc=hch@infradead.org \
    --cc=linux-nfs@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).