Cross vfsmount reflink's are now allowed, the patch is in linux-next and
will go to linus soon. Remove these tests so nobody freaks out when
they start failing.
Signed-off-by: Josef Bacik <josef@xxxxxxxxxxxxxx>
---
tests/generic/373 | 70 -------------------------------------------
tests/generic/373.out | 9 ------
tests/generic/374 | 68 -----------------------------------------
tests/generic/374.out | 10 -------
4 files changed, 157 deletions(-)
delete mode 100755 tests/generic/373
delete mode 100644 tests/generic/373.out
delete mode 100755 tests/generic/374
delete mode 100644 tests/generic/374.out
diff --git a/tests/generic/373 b/tests/generic/373
deleted file mode 100755
index 2f68b24f..00000000
--- a/tests/generic/373
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/bash
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2016 Oracle, Inc. All Rights Reserved.
-#
-# FS QA Test No. 373
-#
-# Check that cross-mountpoint reflink doesn't work.
-#
-. ./common/preamble
-_begin_fstest auto quick clone
-
-_register_cleanup "_cleanup" BUS
-
-# Override the default cleanup function.
-_cleanup()
-{
- cd /
- rm -rf $tmp.*
- wait
-}
-
-# Import common functions.
-. ./common/filter
-. ./common/reflink
-
-# real QA test starts here
-_supported_fs generic
-_require_scratch_reflink
-_require_cp_reflink
-
-echo "Format and mount"
-_scratch_mkfs > $seqres.full 2>&1
-_scratch_mount >> $seqres.full 2>&1
-
-testdir=$SCRATCH_MNT/test-$seq
-mkdir $testdir
-otherdir=/tmp/m.$seq
-othertestdir=$otherdir/test-$seq
-rm -rf $otherdir
-mkdir $otherdir
-
-blocks=1
-blksz=65536
-sz=$((blksz * blocks))
-
-echo "Mount otherdir"
-$MOUNT_PROG --bind $SCRATCH_MNT $otherdir
-
-echo "Create file"
-_pwrite_byte 0x61 0 $sz $testdir/file >> $seqres.full
-
-filter_md5()
-{
- _filter_scratch | sed -e "s,$otherdir,OTHER_DIR,g"
-}
-
-echo "Reflink one file to another"
-_cp_reflink $testdir/file $othertestdir/otherfiles 2>&1 | filter_md5
-
-echo "Check output"
-md5sum $testdir/file | _filter_scratch
-test -e $othertestdir/otherfile && echo "otherfile should not exist"
-
-echo "Unmount otherdir"
-$UMOUNT_PROG $otherdir
-rm -rf $otherdir
-
-# success, all done
-status=0
-exit
diff --git a/tests/generic/373.out b/tests/generic/373.out
deleted file mode 100644
index 60f280fc..00000000
--- a/tests/generic/373.out
+++ /dev/null
@@ -1,9 +0,0 @@
-QA output created by 373
-Format and mount
-Mount otherdir
-Create file
-Reflink one file to another
-cp: failed to clone 'OTHER_DIR/test-373/otherfiles' from 'SCRATCH_MNT/test-373/file': Invalid cross-device link
-Check output
-2d61aa54b58c2e94403fb092c3dbc027 SCRATCH_MNT/test-373/file
-Unmount otherdir
diff --git a/tests/generic/374 b/tests/generic/374
deleted file mode 100755
index d9f33bc3..00000000
--- a/tests/generic/374
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/bash
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2016 Oracle, Inc. All Rights Reserved.
-#
-# FS QA Test No. 374
-#
-# Check that cross-mountpoint dedupe doesn't work.
-#
-. ./common/preamble
-_begin_fstest auto quick clone dedupe
-
-_register_cleanup "_cleanup" BUS
-
-# Override the default cleanup function.
-_cleanup()
-{
- cd /
- rm -rf $tmp.*
- wait
-}
-
-# Import common functions.
-. ./common/filter
-. ./common/reflink
-
-# real QA test starts here
-_supported_fs generic
-_require_scratch_dedupe
-
-echo "Format and mount"
-_scratch_mkfs > $seqres.full 2>&1
-_scratch_mount >> $seqres.full 2>&1
-
-testdir=$SCRATCH_MNT/test-$seq
-mkdir $testdir
-otherdir=/tmp/m.$seq
-othertestdir=$otherdir/test-$seq
-rm -rf $otherdir
-mkdir $otherdir
-
-blocks=1
-blksz=65536
-sz=$((blocks * blksz))
-
-echo "Mount otherdir"
-$MOUNT_PROG --bind $SCRATCH_MNT $otherdir
-
-echo "Create file"
-_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
-
-filter_md5()
-{
- _filter_scratch | sed -e "s,$otherdir,OTHER_DIR,g"
-}
-echo "Check output"
-md5sum $testdir/file $othertestdir/otherfile | filter_md5
-
-echo "Unmount otherdir"
-$UMOUNT_PROG $otherdir
-rm -rf $otherdir
-
-# success, all done
-status=0
-exit
diff --git a/tests/generic/374.out b/tests/generic/374.out
deleted file mode 100644
index 3243ad3d..00000000
--- a/tests/generic/374.out
+++ /dev/null
@@ -1,10 +0,0 @@
-QA output created by 374
-Format and mount
-Mount otherdir
-Create file
-Dedupe one file to another
-XFS_IOC_FILE_EXTENT_SAME: Invalid cross-device link
-Check output
-2d61aa54b58c2e94403fb092c3dbc027 SCRATCH_MNT/test-374/file
-2d61aa54b58c2e94403fb092c3dbc027 OTHER_DIR/test-374/otherfile
-Unmount otherdir
--
2.26.3
