From: Luis Henriques <lhenriques@suse.com>
To: fstests@vger.kernel.org
Cc: Anna Schumaker <Anna.Schumaker@Netapp.com>,
Luis Henriques <lhenriques@suse.com>
Subject: [PATCH 2/2] common/rc: handle xfs_io copy_range when copy_file_range syscall isn't available
Date: Mon, 26 Jun 2017 17:40:53 +0100 [thread overview]
Message-ID: <20170626164053.7634-2-lhenriques@suse.com> (raw)
In-Reply-To: <20170626164053.7634-1-lhenriques@suse.com>
_require_xfs_io_command() isn't handling the case where the copy_file_range
syscall isn't available. Unfortunately, old versions of xfs_io don't
handle it correctly either and the test will succeed with an empty file.
To fix this function, we need to add two checks:
1) for old xfs_io versions, fail if the test seems to succeed (no output)
but the file created is empty,
2) for newer versions, use the error returned.
Signed-off-by: Luis Henriques <lhenriques@suse.com>
---
common/rc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/common/rc b/common/rc
index 2972f89e9527..aad065cb2ade 100644
--- a/common/rc
+++ b/common/rc
@@ -2146,6 +2146,10 @@ _require_xfs_io_command()
$XFS_IO_PROG -F -f -c "pwrite 0 4k" $testfile > /dev/null 2>&1
testio=`$XFS_IO_PROG -F -f -c "copy_range $testfile" $testcopy 2>&1`
rm -f $testcopy > /dev/null 2>&1
+ [ -z "$testio" -a ! -s "$testcopy" ] && \
+ _notrun "xfs_io $command support is missing"
+ echo $testio | egrep -q "Function not implemented" && \
+ _notrun "xfs_io $command support is missing"
;;
"falloc" )
testio=`$XFS_IO_PROG -F -f -c "falloc $param 0 1m" $testfile 2>&1`
next prev parent reply other threads:[~2017-06-26 16:40 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-26 16:40 [PATCH 1/2] generic/430: Fix filename in "copy beyond end" test Luis Henriques
2017-06-26 16:40 ` Luis Henriques [this message]
2017-06-27 5:25 ` [PATCH 2/2] common/rc: handle xfs_io copy_range when copy_file_range syscall isn't available Eryu Guan
2017-06-27 8:50 ` Luis Henriques
2017-06-28 7:50 ` Eryu Guan
2017-06-28 11:20 ` [PATCH 2/2 v2] " Luis Henriques
2017-06-28 14:21 ` [PATCH 1/2] generic/430: Fix filename in "copy beyond end" test David Disseldorp
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=20170626164053.7634-2-lhenriques@suse.com \
--to=lhenriques@suse.com \
--cc=Anna.Schumaker@Netapp.com \
--cc=fstests@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