generic/374: validate cross-vfsmount dedupe

We allow for cross-vfsmount dedupes now, change this test to
validate dedupe works properly cross-vfsmount.

Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/generic/374 b/tests/generic/374
index d9f33bc3eeb0f1cd56262b5b7af162fe27f1f2dc..f66d13970d0f76c9c2df4ee97689414644778b37 100755 (executable)
--- a/tests/generic/374
+++ b/tests/generic/374
@@ -4,7 +4,7 @@
 #
 # FS QA Test No. 374
 #
-# Check that cross-mountpoint dedupe doesn't work.
+# Check that cross-mountpoint dedupe works
 #
 . ./common/preamble
 _begin_fstest auto quick clone dedupe
@@ -50,7 +50,8 @@ _pwrite_byte 0x61 0 $sz $testdir/file >> $seqres.full
 _pwrite_byte 0x61 0 $sz $testdir/otherfile >> $seqres.full
 
 echo "Dedupe one file to another"
-_dedupe_range $testdir/file 0 $othertestdir/otherfile 0 $sz 2>&1 | _filter_dedupe_error
+_dedupe_range $testdir/file 0 $othertestdir/otherfile 0 $sz 2>&1 \
+       | _filter_xfs_io
 
 filter_md5()
 {

diff --git a/tests/generic/374.out b/tests/generic/374.out
index 3243ad3da1a9168a728700d384ec16799795eb27..b62c64b46574abefb4d453b3a20037eb3ebd6742 100644 (file)
--- a/tests/generic/374.out
+++ b/tests/generic/374.out
@@ -3,7 +3,8 @@ Format and mount
 Mount otherdir
 Create file
 Dedupe one file to another
-XFS_IOC_FILE_EXTENT_SAME: Invalid cross-device link
+deduped 65536/65536 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 Check output
 2d61aa54b58c2e94403fb092c3dbc027  SCRATCH_MNT/test-374/file
 2d61aa54b58c2e94403fb092c3dbc027  OTHER_DIR/test-374/otherfile