common/rc: Remove special handing of 'dup' argument for btrfs

[xfstests-dev.git] / common / rc

diff --git a/common/rc b/common/rc
index 17b89d5d8519471ebaf2089401a923d877e924e5..cfaabf10ecd90885c8f30f5d18519092c26e20b9 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -98,7 +98,7 @@ _dump_err_cont()
 _dump_err2()
 {
     _err_msg="$*"
-    >2& echo "$_err_msg"
+    >&2 echo "$_err_msg"
 }
 
 _log_err()
@@ -885,13 +885,7 @@ _scratch_pool_mkfs()
 {
     case $FSTYP in
     btrfs)
-        # if dup profile is in mkfs options call _scratch_mkfs instead
-        # because dup profile only works with single device
-        if [[ "$*" =~ dup ]]; then
-            _scratch_mkfs $*
-        else
-            $MKFS_BTRFS_PROG $MKFS_OPTIONS $* $SCRATCH_DEV_POOL > /dev/null
-        fi
+        $MKFS_BTRFS_PROG $MKFS_OPTIONS $* $SCRATCH_DEV_POOL > /dev/null
         ;;
     *)
         echo "_scratch_pool_mkfs is not implemented for $FSTYP" 1>&2
@@ -1112,11 +1106,20 @@ _repair_scratch_fs()
        return $res
         ;;
     *)
-        # Let's hope fsck -y suffices...
-        fsck -t $FSTYP -y $SCRATCH_DEV 2>&1
+       local dev=$SCRATCH_DEV
+       local fstyp=$FSTYP
+       if [ $FSTYP = "overlay" -a -n "$OVL_BASE_SCRATCH_DEV" ]; then
+               _repair_overlay_scratch_fs
+               # Fall through to repair base fs
+               dev=$OVL_BASE_SCRATCH_DEV
+               fstyp=$OVL_BASE_FSTYP
+               $UMOUNT_PROG $OVL_BASE_SCRATCH_MNT
+       fi
+       # Let's hope fsck -y suffices...
+       fsck -t $fstyp -y $dev 2>&1
        local res=$?
        case $res in
-       0|1|2)
+       $FSCK_OK|$FSCK_NONDESTRUCT|$FSCK_REBOOT)
                res=0
                ;;
        *)
@@ -2075,24 +2078,41 @@ _require_xfs_io_command()
        local command=$1
        shift
        local param="$*"
-       local param_checked=0
+       local param_checked=""
        local opts=""
 
        local testfile=$TEST_DIR/$$.xfs_io
        local testio
        case $command in
+       "chattr")
+               if [ -z "$param" ]; then
+                       param=s
+               fi
+               # Test xfs_io chattr support AND
+               # filesystem FS_IOC_FSSETXATTR support
+               testio=`$XFS_IO_PROG -F -f -c "chattr +$param" $testfile 2>&1`
+               $XFS_IO_PROG -F -f -r -c "chattr -$param" $testfile 2>&1
+               param_checked="+$param"
+               ;;
        "chproj")
                testio=`$XFS_IO_PROG -F -f -c "chproj 0" $testfile 2>&1`
                ;;
        "copy_range")
                local testcopy=$TEST_DIR/$$.copy.xfs_io
+               local copy_opts=$testfile
+               if [ "$param" == "-f" ]; then
+                       # source file is the open destination file
+                       testcopy=$testfile
+                       copy_opts="0 -d 4k -l 4k"
+               fi
                $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`
+               testio=`$XFS_IO_PROG -F -f -c "copy_range $param $copy_opts" $testcopy 2>&1`
                rm -f $testcopy > /dev/null 2>&1
+               param_checked="$param"
                ;;
        "falloc" )
                testio=`$XFS_IO_PROG -F -f -c "falloc $param 0 1m" $testfile 2>&1`
-               param_checked=1
+               param_checked="$param"
                ;;
        "fpunch" | "fcollapse" | "zero" | "fzero" | "finsert" | "funshare")
                local blocksize=$(_get_block_size $TEST_DIR)
@@ -2110,7 +2130,7 @@ _require_xfs_io_command()
                fi
                testio=`$XFS_IO_PROG -F -f -c "pwrite 0 20k" -c "fsync" \
                        -c "fiemap -v $param" $testfile 2>&1`
-               param_checked=1
+               param_checked="$param"
                ;;
        "flink")
                local testlink=$TEST_DIR/$$.link.xfs_io
@@ -2150,7 +2170,7 @@ _require_xfs_io_command()
                fi
                testio=`$XFS_IO_PROG -f $opts -c \
                        "pwrite $pwrite_opts $param 0 4k" $testfile 2>&1`
-               param_checked=1
+               param_checked="$pwrite_opts $param"
                ;;
        "scrub"|"repair")
                testio=`$XFS_IO_PROG -x -c "$command probe" $TEST_DIR 2>&1`
@@ -2170,19 +2190,19 @@ _require_xfs_io_command()
 
        rm -f $testfile 2>&1 > /dev/null
        echo $testio | grep -q "not found" && \
-               _notrun "xfs_io $command support is missing"
+               _notrun "xfs_io $command $param_checked support is missing"
        echo $testio | grep -q "Operation not supported\|Inappropriate ioctl" && \
-               _notrun "xfs_io $command failed (old kernel/wrong fs?)"
+               _notrun "xfs_io $command $param_checked failed (old kernel/wrong fs?)"
        echo $testio | grep -q "Invalid" && \
-               _notrun "xfs_io $command failed (old kernel/wrong fs/bad args?)"
+               _notrun "xfs_io $command $param_checked failed (old kernel/wrong fs/bad args?)"
        echo $testio | grep -q "foreign file active" && \
-               _notrun "xfs_io $command not supported on $FSTYP"
+               _notrun "xfs_io $command $param_checked not supported on $FSTYP"
        echo $testio | grep -q "Function not implemented" && \
-               _notrun "xfs_io $command support is missing (missing syscall?)"
+               _notrun "xfs_io $command $param_checked support is missing (missing syscall?)"
 
        [ -n "$param" ] || return
 
-       if [ $param_checked -eq 0 ]; then
+       if [ -z "$param_checked" ]; then
                $XFS_IO_PROG -c "help $command" | grep -q "^ $param --" || \
                        _notrun "xfs_io $command doesn't support $param"
        else
@@ -2326,7 +2346,7 @@ _fstyp_has_non_default_seek_data_hole()
        fi
 
        case "$fstyp" in
-       btrfs|ext4|xfs|ceph|cifs|f2fs|gfs2|ocfs2|tmpfs)
+       btrfs|ext4|xfs|cifs|f2fs|gfs2|ocfs2|tmpfs)
                return 0
                ;;
        nfs*)
@@ -2775,7 +2795,7 @@ _full_platform_details()
 {
      local os=`uname -s`
      local host=`hostname -s`
-     local kernel=`uname -r`
+     local kernel=`uname -rv`
      local platform=`uname -m`
      echo "$os/$platform $host $kernel"
 }
@@ -3074,7 +3094,7 @@ _require_scratch_shutdown()
                        # SCRATCH_DEV, in this case OVL_BASE_SCRATCH_DEV
                        # will be null, so check OVL_BASE_SCRATCH_DEV before
                        # running shutdown to avoid shutting down base fs accidently.
-                       _notrun "$SCRATCH_DEV is not a block device"
+                       _notrun "This test requires a valid $OVL_BASE_SCRATCH_DEV as ovl base fs"
                else
                        src/godown -f $OVL_BASE_SCRATCH_MNT 2>&1 \
                        || _notrun "Underlying filesystem does not support shutdown"
@@ -3922,6 +3942,9 @@ _label_get_max()
        btrfs)
                echo 255
                ;;
+       f2fs)
+               echo 255
+               ;;
        *)
                _notrun "$FSTYP does not define maximum label length"
                ;;
@@ -3978,6 +4001,13 @@ _require_scratch_btime()
        _scratch_unmount
 }
 
+_require_inode_limits()
+{
+       if [ $(_get_free_inode $TEST_DIR) -eq 0 ]; then
+               _notrun "$FSTYP does not have a fixed number of inodes available"
+       fi
+}
+
 _require_filefrag_options()
 {
        _require_command "$FILEFRAG_PROG" filefrag
@@ -4009,6 +4039,14 @@ _try_wipe_scratch_devs()
 {
        test -x "$WIPEFS_PROG" || return 0
 
+       # Do specified filesystem wipe at first
+       case "$FSTYP" in
+       "xfs")
+               _try_wipe_scratch_xfs
+               ;;
+       esac
+
+       # Then do wipefs on all scratch devices
        for dev in $SCRATCH_DEV_POOL $SCRATCH_DEV $SCRATCH_LOGDEV $SCRATCH_RTDEV; do
                test -b $dev && $WIPEFS_PROG -a $dev
        done