generic: move btrfs clone device testcase to the generic group

Given that ext4 also allows mounting of a cloned filesystem, the btrfs
test case btrfs/312, which assesses the functionality of cloned
filesystem support, can be refactored to be under the generic group.

So add _require_duplicated_fsid helper, then move btrfs/312 to generic.

[zlang: remove "quick" group, change the cleanup of g/744 a bit]

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>

diff --git a/common/rc b/common/rc
index b7b77ac1b46d33a7a5a6111da5fca4b49443a255..56f1afb6dccdfabb96e8f1b2eee8991231acc05a 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -5459,6 +5459,20 @@ _random_file() {
        echo "$basedir/$(ls -U $basedir | shuf -n 1)"
 }
 
+_require_duplicate_fsid()
+{
+       case "$FSTYP" in
+       "btrfs")
+               _require_btrfs_fs_feature temp_fsid
+               ;;
+       "ext4")
+               ;;
+       *)
+               _notrun "$FSTYP does not support duplicate fsid"
+               ;;
+       esac
+}
+
 init_rc
 
 ################################################################################

diff --git a/tests/btrfs/312 b/tests/btrfs/312
deleted file mode 100755 (executable)
index eedcf11..0000000
--- a/tests/btrfs/312
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/bash
-# SPDX-License-Identifier: GPL-2.0
-# Copyright (c) 2024 Oracle.  All Rights Reserved.
-#
-# FS QA Test 312
-#
-# On a clone a device check to see if tempfsid is activated.
-#
-. ./common/preamble
-_begin_fstest auto quick clone tempfsid
-
-_cleanup()
-{
-       cd /
-       $UMOUNT_PROG $mnt1 > /dev/null 2>&1
-       rm -r -f $tmp.*
-       rm -r -f $mnt1
-}
-
-. ./common/filter.btrfs
-. ./common/reflink
-
-_supported_fs btrfs
-_require_scratch_dev_pool 2
-_scratch_dev_pool_get 2
-_require_btrfs_fs_feature temp_fsid
-
-mnt1=$TEST_DIR/$seq/mnt1
-mkdir -p $mnt1
-
-create_cloned_devices()
-{
-       local dev1=$1
-       local dev2=$2
-
-       echo -n Creating cloned device...
-       _mkfs_dev -fq -b $((1024 * 1024 * 300)) $dev1
-
-       _mount $dev1 $SCRATCH_MNT
-
-       $XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | \
-                                                               _filter_xfs_io
-       $UMOUNT_PROG $SCRATCH_MNT
-       # device dump of $dev1 to $dev2
-       dd if=$dev1 of=$dev2 bs=300M count=1 conv=fsync status=none || \
-                                                       _fail "dd failed: $?"
-       echo done
-}
-
-mount_cloned_device()
-{
-       echo ---- $FUNCNAME ----
-       create_cloned_devices ${SCRATCH_DEV_NAME[0]} ${SCRATCH_DEV_NAME[1]}
-
-       echo Mounting original device
-       _mount ${SCRATCH_DEV_NAME[0]} $SCRATCH_MNT
-       $XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $SCRATCH_MNT/foo | \
-                                                               _filter_xfs_io
-       check_fsid ${SCRATCH_DEV_NAME[0]}
-
-       echo Mounting cloned device
-       _mount ${SCRATCH_DEV_NAME[1]} $mnt1 || \
-                               _fail "mount failed, tempfsid didn't work"
-
-       echo cp reflink must fail
-       _cp_reflink $SCRATCH_MNT/foo $mnt1/bar 2>&1 | \
-                                               _filter_testdir_and_scratch
-
-       check_fsid ${SCRATCH_DEV_NAME[1]}
-}
-
-mount_cloned_device
-
-_scratch_dev_pool_put
-
-# success, all done
-status=0
-exit

diff --git a/tests/btrfs/312.out b/tests/btrfs/312.out
deleted file mode 100644 (file)
index b7de6ce..0000000
--- a/tests/btrfs/312.out
+++ /dev/null
@@ -1,19 +0,0 @@
-QA output created by 312
----- mount_cloned_device ----
-Creating cloned device...wrote 9000/9000 bytes at offset 0
-XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-done
-Mounting original device
-wrote 9000/9000 bytes at offset 0
-XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-On disk fsid:          FSID
-Metadata uuid:         FSID
-Temp fsid:             FSID
-Tempfsid status:       0
-Mounting cloned device
-cp reflink must fail
-cp: failed to clone 'TEST_DIR/312/mnt1/bar' from 'SCRATCH_MNT/foo': Invalid cross-device link
-On disk fsid:          FSID
-Metadata uuid:         FSID
-Temp fsid:             TEMPFSID
-Tempfsid status:       1

diff --git a/tests/generic/744 b/tests/generic/744
new file mode 100755 (executable)
index 0000000..ef1de82
--- /dev/null
+++ b/tests/generic/744
@@ -0,0 +1,81 @@
+#! /bin/bash
+# SPDX-License-Identifier: GPL-2.0
+# Copyright (c) 2024 Oracle. All Rights Reserved.
+#
+# FS QA Test 744
+#
+# Set up a filesystem, create a clone, mount both, and verify if the cp reflink
+# operation between these two mounts fails.
+#
+. ./common/preamble
+_begin_fstest auto clone volume tempfsid
+
+_cleanup()
+{
+       cd /
+       rm -r -f $tmp.*
+
+       $UMOUNT_PROG $mnt2 &> /dev/null
+       $UMOUNT_PROG $mnt1 &> /dev/null
+       [ -b "$loop_dev2" ] && losetup -d $loop_dev2
+       [ -b "$loop_dev1" ] && losetup -d $loop_dev1
+       [ -n "$seq" ] && rm -rf $TEST_DIR/$seq
+}
+
+. ./common/filter
+. ./common/reflink
+
+# Modify as appropriate.
+_supported_fs generic
+_require_duplicate_fsid
+_require_test
+_require_block_device $TEST_DEV
+_require_test_reflink
+_require_cp_reflink
+_require_loop
+
+clone_filesystem()
+{
+       local dev1=$1
+       local dev2=$2
+
+       _mkfs_dev $dev1
+
+       _mount $dev1 $mnt1
+       $XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $mnt1/foo >> $seqres.full
+       $UMOUNT_PROG $mnt1
+
+       # device dump of $dev1 to $dev2
+       dd if=$dev1 of=$dev2 conv=fsync status=none || _fail "dd failed: $?"
+}
+
+[ -n "$seq" ] && rm -rf $TEST_DIR/$seq
+mkdir $TEST_DIR/$seq
+
+mnt1=$TEST_DIR/$seq/mnt1
+mnt2=$TEST_DIR/$seq/mnt2
+mkdir -p $mnt1 $mnt2
+
+loop_file1="$TEST_DIR/$seq/image1"
+truncate -s 300m "$loop_file1"
+loop_dev1=$(_create_loop_device "$loop_file1")
+
+loop_file2="$TEST_DIR/$seq/image2"
+truncate -s 300m "$loop_file2"
+loop_dev2=$(_create_loop_device "$loop_file2")
+
+clone_filesystem ${loop_dev1} ${loop_dev2}
+
+# Mounting original device
+_mount $loop_dev1 $mnt1
+$XFS_IO_PROG -fc 'pwrite -S 0x61 0 9000' $mnt1/foo | _filter_xfs_io
+
+# Mounting cloned device
+_mount $loop_dev2 $mnt2 || _fail "mount of cloned device failed"
+
+# cp reflink across two different filesystems must fail
+_cp_reflink $mnt1/foo $mnt2/bar 2>&1 | _filter_test_dir
+
+# success, all done
+status=0
+exit

diff --git a/tests/generic/744.out b/tests/generic/744.out
new file mode 100644 (file)
index 0000000..1850a0e
--- /dev/null
+++ b/tests/generic/744.out
@@ -0,0 +1,4 @@
+QA output created by 744
+wrote 9000/9000 bytes at offset 0
+XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+cp: failed to clone 'TEST_DIR/744/mnt2/bar' from 'TEST_DIR/744/mnt1/foo': Invalid cross-device link