From: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Always export STATX_WRITE_ATOMIC so anyone can use it, make the "cp
reflink" logic work for any filesystem, not just xfs, and create a
separate helper to check that the necessary xfs_io support is present.
Signed-off-by: "Darrick J. Wong" <djwong@xxxxxxxxxx>
Signed-off-by: Catherine Hoang <catherine.hoang@xxxxxxxxxx>
Reviewed-by: John Garry <john.g.garry@xxxxxxxxxx>
Reviewed-by: Ritesh Harjani (IBM) <ritesh.list@xxxxxxxxx>
---
common/atomicwrites | 18 +++++++++++-------
tests/generic/765 | 2 +-
2 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/common/atomicwrites b/common/atomicwrites
index fd3a9b71..9ec1ca68 100644
--- a/common/atomicwrites
+++ b/common/atomicwrites
@@ -4,6 +4,8 @@
#
# Routines for testing atomic writes.
+export STATX_WRITE_ATOMIC=0x10000
+
_get_atomic_write_unit_min()
{
$XFS_IO_PROG -c "statx -r -m $STATX_WRITE_ATOMIC" $1 | \
@@ -26,8 +28,6 @@ _require_scratch_write_atomic()
{
_require_scratch
- export STATX_WRITE_ATOMIC=0x10000
-
awu_min_bdev=$(_get_atomic_write_unit_min $SCRATCH_DEV)
awu_max_bdev=$(_get_atomic_write_unit_max $SCRATCH_DEV)
@@ -51,6 +51,14 @@ _require_scratch_write_atomic()
fi
}
+# Check for xfs_io commands required to run _test_atomic_file_writes
+_require_atomic_write_test_commands()
+{
+ _require_xfs_io_command "falloc"
+ _require_xfs_io_command "fpunch"
+ _require_xfs_io_command pwrite -A
+}
+
_test_atomic_file_writes()
{
local bsize="$1"
@@ -64,11 +72,7 @@ _test_atomic_file_writes()
test $bytes_written -eq $bsize || echo "atomic write len=$bsize failed"
# Check that we can perform an atomic single-block cow write
- if [ "$FSTYP" == "xfs" ]; then
- testfile_cp=$SCRATCH_MNT/testfile_copy
- if _xfs_has_feature $SCRATCH_MNT reflink; then
- cp --reflink $testfile $testfile_cp
- fi
+ if cp --reflink=always $testfile $testfile_cp 2>> $seqres.full; then
bytes_written=$($XFS_IO_PROG -dc "pwrite -A -D -V1 -b $bsize 0 $bsize" $testfile_cp | \
grep wrote | awk -F'[/ ]' '{print $2}')
test $bytes_written -eq $bsize || echo "atomic write on reflinked file failed"
diff --git a/tests/generic/765 b/tests/generic/765
index 09e9fa38..71604e5e 100755
--- a/tests/generic/765
+++ b/tests/generic/765
@@ -12,7 +12,7 @@ _begin_fstest auto quick rw atomicwrites
. ./common/atomicwrites
_require_scratch_write_atomic
-_require_xfs_io_command pwrite -A
+_require_atomic_write_test_commands
get_supported_bsize()
{
--
2.34.1
