fstests: remove old electric fence support
[xfstests-dev.git] / common / rc
index a6caca96c888dfb17b8422de2b59dd2d95c29cd2..ee677e7dc6b2b5cab801846485d15bb3e329b375 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -53,12 +53,7 @@ _require_math()
 _math()
 {
        [ $# -le 0 ] && return
-       if [ "$BC" ]; then
-               result=$(LANG=C echo "scale=0; $@" | "$BC" -q 2> /dev/null)
-       else
-               _notrun "this test requires 'bc' tool for doing math operations"
-       fi
-       echo "$result"
+       LANG=C echo "scale=0; $@" | "$BC" -q 2> /dev/null
 }
 
 dd()
@@ -86,22 +81,22 @@ _md5_checksum()
 
 # Write a byte into a range of a file
 _pwrite_byte() {
-       pattern="$1"
-       offset="$2"
-       len="$3"
-       file="$4"
-       xfs_io_args="$5"
+       local pattern="$1"
+       local offset="$2"
+       local len="$3"
+       local file="$4"
+       local xfs_io_args="$5"
 
        $XFS_IO_PROG $xfs_io_args -f -c "pwrite -S $pattern $offset $len" "$file"
 }
 
 # mmap-write a byte into a range of a file
 _mwrite_byte() {
-       pattern="$1"
-       offset="$2"
-       len="$3"
-       mmap_len="$4"
-       file="$5"
+       local pattern="$1"
+       local offset="$2"
+       local len="$3"
+       local mmap_len="$4"
+       local file="$5"
 
        $XFS_IO_PROG -f -c "mmap -rw 0 $mmap_len" -c "mwrite -S $pattern $offset $len" "$file"
 }
@@ -127,20 +122,20 @@ fi
 
 _dump_err()
 {
-    err_msg="$*"
-    echo "$err_msg"
+    _err_msg="$*"
+    echo "$_err_msg"
 }
 
 _dump_err2()
 {
-    err_msg="$*"
-    >2& echo "$err_msg"
+    _err_msg="$*"
+    >2& echo "$_err_msg"
 }
 
 _log_err()
 {
-    err_msg="$*"
-    echo "$err_msg" | tee -a $seqres.full
+    _err_msg="$*"
+    echo "$_err_msg" | tee -a $seqres.full
     echo "(see $seqres.full for details)"
 }
 
@@ -249,6 +244,8 @@ _clear_mount_stack()
 _scratch_options()
 {
     local type=$1
+    local rt_opt=""
+    local log_opt=""
     SCRATCH_OPTIONS=""
 
     if [ "$FSTYP" != "xfs" ]; then
@@ -274,7 +271,9 @@ _scratch_options()
 
 _test_options()
 {
-    type=$1
+    local type=$1
+    local rt_opt=""
+    local log_opt=""
     TEST_OPTIONS=""
 
     if [ "$FSTYP" != "xfs" ]; then
@@ -299,15 +298,15 @@ _test_options()
 
 _mount_ops_filter()
 {
-    params="$*"
-    
+    local params="$*"
+    local last_index=$(( $# - 1 ))
+
     #get mount point to handle dmapi mtpt option correctly
-    let last_index=$#-1
     [ $last_index -gt 0 ] && shift $last_index
-    FS_ESCAPED=$1
-    
+    local fs_escaped=$1
+
     echo $params | sed -e 's/dmapi/dmi/' \
-        | $PERL_PROG -ne "s#mtpt=[^,|^\n|^\s]*#mtpt=$FS_ESCAPED\1\2#; print;"
+        | $PERL_PROG -ne "s#mtpt=[^,|^\n|^\s]*#mtpt=$fs_escaped\1\2#; print;"
 
 }
 
@@ -352,13 +351,20 @@ _supports_filetype()
        esac
 }
 
+# mount scratch device with given options but don't check mount status
+_try_scratch_mount()
+{
+       if [ "$FSTYP" == "overlay" ]; then
+               _overlay_scratch_mount $*
+               return $?
+       fi
+       _mount -t $FSTYP `_scratch_mount_options $*`
+}
+
+# mount scratch device with given options and _fail if mount fails
 _scratch_mount()
 {
-    if [ "$FSTYP" == "overlay" ]; then
-        _overlay_scratch_mount $*
-        return $?
-    fi
-    _mount -t $FSTYP `_scratch_mount_options $*`
+       _try_scratch_mount $* || _fail "mount failed"
 }
 
 _scratch_unmount()
@@ -397,7 +403,7 @@ _scratch_cycle_mount()
        opts="-o $opts"
     fi
     _scratch_unmount
-    _scratch_mount "$opts"
+    _try_scratch_mount "$opts" || _fail "cycle mount failed"
 }
 
 _scratch_shutdown()
@@ -499,9 +505,9 @@ _scratch_do_mkfs()
 
 _scratch_metadump()
 {
-       dumpfile=$1
+       local dumpfile=$1
        shift
-       options=
+       local options=
 
        [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
                options="-l $SCRATCH_LOGDEV"
@@ -511,7 +517,7 @@ _scratch_metadump()
 
 _setup_large_ext4_fs()
 {
-       fs_size=$1
+       local fs_size=$1
        local tmp_dir=/tmp/
 
        [ "$LARGE_SCRATCH_DEV" != yes ] && return 0
@@ -520,11 +526,11 @@ _setup_large_ext4_fs()
 
        # Default free space in the FS is 50GB, but you can specify more via
        # SCRATCH_DEV_EMPTY_SPACE
-       space_to_consume=$(($fs_size - 50*1024*1024*1024 - $SCRATCH_DEV_EMPTY_SPACE))
+       local space_to_consume=$(($fs_size - 50*1024*1024*1024 - $SCRATCH_DEV_EMPTY_SPACE))
 
        # mount the filesystem and create 16TB - 4KB files until we consume
        # all the necessary space.
-       _scratch_mount 2>&1 >$tmp_dir/mnt.err
+       _try_scratch_mount 2>&1 >$tmp_dir/mnt.err
        local status=$?
        if [ $status -ne 0 ]; then
                echo "mount failed"
@@ -534,8 +540,8 @@ _setup_large_ext4_fs()
        fi
        rm -f $tmp_dir/mnt.err
 
-       file_size=$((16*1024*1024*1024*1024 - 4096))
-       nfiles=0
+       local file_size=$((16*1024*1024*1024*1024 - 4096))
+       local nfiles=0
        while [ $space_to_consume -gt $file_size ]; do
 
                xfs_io -F -f \
@@ -586,7 +592,7 @@ _scratch_mkfs_ext4()
 
        if [ $mkfs_status -eq 0 -a "$LARGE_SCRATCH_DEV" = yes ]; then
                # manually parse the mkfs output to get the fs size in bytes
-               fs_size=`cat $tmp.mkfsstd | awk ' \
+               local fs_size=`cat $tmp.mkfsstd | awk ' \
                        /^Block size/ { split($2, a, "="); bs = a[2] ; } \
                        / inodes, / { blks = $3 } \
                        /reserved for the super user/ { resv = $1 } \
@@ -922,8 +928,9 @@ _free_memory_bytes()
 # _scratch_mkfs_sized <size in bytes> [optional blocksize]
 _scratch_mkfs_sized()
 {
-    fssize=$1
-    blocksize=$2
+    local fssize=$1
+    local blocksize=$2
+    local def_blksz
 
     case $FSTYP in
     xfs)
@@ -941,7 +948,7 @@ _scratch_mkfs_sized()
     [ -z "$blocksize" ] && blocksize=4096
 
 
-    re='^[0-9]+$'
+    local re='^[0-9]+$'
     if ! [[ $fssize =~ $re ]] ; then
         _notrun "error: _scratch_mkfs_sized: fs size \"$fssize\" not an integer."
     fi
@@ -949,10 +956,10 @@ _scratch_mkfs_sized()
         _notrun "error: _scratch_mkfs_sized: block size \"$blocksize\" not an integer."
     fi
 
-    blocks=`expr $fssize / $blocksize`
+    local blocks=`expr $fssize / $blocksize`
 
     if [ "$HOSTOS" == "Linux" -a -b "$SCRATCH_DEV" ]; then
-       devsize=`blockdev --getsize64 $SCRATCH_DEV`
+       local devsize=`blockdev --getsize64 $SCRATCH_DEV`
        [ "$fssize" -gt "$devsize" ] && _notrun "Scratch device too small"
     fi
 
@@ -975,12 +982,12 @@ _scratch_mkfs_sized()
        # filesystem, which will cause mkfs.gfs2 to fail.  Until that's fixed,
        # shrink the journal size to at most one eigth of the filesystem and at
        # least 8 MiB, the minimum size allowed.
-       MIN_JOURNAL_SIZE=8
-       DEFAULT_JOURNAL_SIZE=128
-       if (( fssize/8 / (1024*1024) < DEFAULT_JOURNAL_SIZE )); then
-           (( JOURNAL_SIZE = fssize/8 / (1024*1024) ))
-           (( JOURNAL_SIZE >= MIN_JOURNAL_SIZE )) || JOURNAL_SIZE=$MIN_JOURNAL_SIZE
-           MKFS_OPTIONS="-J $JOURNAL_SIZE $MKFS_OPTIONS"
+       local min_journal_size=8
+       local default_journal_size=128
+       if (( fssize/8 / (1024*1024) < default_journal_size )); then
+           local journal_size=$(( fssize/8 / (1024*1024) ))
+           (( journal_size >= min_journal_size )) || journal_size=$min_journal_size
+           MKFS_OPTIONS="-J $journal_size $MKFS_OPTIONS"
        fi
        ${MKFS_PROG}.$FSTYP $MKFS_OPTIONS -O -b $blocksize $SCRATCH_DEV $blocks
        ;;
@@ -992,7 +999,7 @@ _scratch_mkfs_sized()
        ;;
     btrfs)
        local mixed_opt=
-       (( fssize <= 100 * 1024 * 1024 )) && mixed_opt='--mixed'
+       (( fssize <= 1024 * 1024 * 1024 )) && mixed_opt='--mixed'
        $MKFS_BTRFS_PROG $MKFS_OPTIONS $mixed_opt -b $fssize $SCRATCH_DEV
        ;;
     jfs)
@@ -1008,11 +1015,11 @@ _scratch_mkfs_sized()
        ;;
     f2fs)
        # mkfs.f2fs requires # of sectors as an input for the size
-       sector_size=`blockdev --getss $SCRATCH_DEV`
+       local sector_size=`blockdev --getss $SCRATCH_DEV`
        $MKFS_F2FS_PROG $MKFS_OPTIONS $SCRATCH_DEV `expr $fssize / $sector_size`
        ;;
     tmpfs)
-       free_mem=`_free_memory_bytes`
+       local free_mem=`_free_memory_bytes`
        if [ "$free_mem" -lt "$fssize" ] ; then
           _notrun "Not enough memory ($free_mem) for tmpfs with $fssize bytes"
        fi
@@ -1028,13 +1035,13 @@ _scratch_mkfs_sized()
 # _scratch_mkfs_geom <sunit bytes> <swidth multiplier> [optional blocksize]
 _scratch_mkfs_geom()
 {
-    sunit_bytes=$1
-    swidth_mult=$2
-    blocksize=$3
+    local sunit_bytes=$1
+    local swidth_mult=$2
+    local blocksize=$3
     [ -z "$blocksize" ] && blocksize=4096
 
-    let sunit_blocks=$sunit_bytes/$blocksize
-    let swidth_blocks=$sunit_blocks*$swidth_mult
+    local sunit_blocks=$(( sunit_bytes / blocksize ))
+    local swidth_blocks=$(( sunit_blocks * swidth_mult ))
 
     case $FSTYP in
     xfs)
@@ -1054,9 +1061,9 @@ _scratch_mkfs_geom()
 # _scratch_mkfs_blocksized blocksize
 _scratch_mkfs_blocksized()
 {
-    blocksize=$1
+    local blocksize=$1
 
-    re='^[0-9]+$'
+    local re='^[0-9]+$'
     if ! [[ $blocksize =~ $re ]] ; then
         _notrun "error: _scratch_mkfs_sized: block size \"$blocksize\" not an integer."
     fi
@@ -1100,10 +1107,10 @@ _repair_scratch_fs()
     case $FSTYP in
     xfs)
         _scratch_xfs_repair "$@" 2>&1
-       res=$?
+       local res=$?
        if [ "$res" -ne 0 ]; then
                echo "xfs_repair returns $res; replay log?"
-               _scratch_mount
+               _try_scratch_mount
                res=$?
                if [ "$res" -gt 0 ]; then
                        echo "mount returns $res; zap log?"
@@ -1123,7 +1130,7 @@ _repair_scratch_fs()
     *)
         # Let's hope fsck -y suffices...
         fsck -t $FSTYP -y $SCRATCH_DEV 2>&1
-       res=$?
+       local res=$?
        case $res in
        0|1|2)
                res=0
@@ -1162,27 +1169,6 @@ _get_pids_by_name()
        -e "/[0-9]:[0-9][0-9]  *$1 /s/ .*//p"
 }
 
-# fix malloc libs output
-#
-_fix_malloc()
-{
-    # filter out the Electric Fence notice
-    $PERL_PROG -e '
-        while (<>) {
-            if (defined $o && /^\s+Electric Fence/) {
-                chomp($o);
-                print "$o";
-                undef $o;
-                next;
-            }
-            print $o if (defined $o);
-
-            $o=$_;
-        }
-        print $o if (defined $o);
-    '
-}
-
 #
 # _df_device : get an IRIX style df line for a given device
 #
@@ -1310,13 +1296,13 @@ _is_block_dev()
        exit 1
     fi
 
-    _dev=$1
-    if [ -L "${_dev}" ]; then
-        _dev=`readlink -f "${_dev}"`
+    local dev=$1
+    if [ -L "$dev" ]; then
+        dev=`readlink -f "$dev"`
     fi
 
-    if [ -b "${_dev}" ]; then
-        src/lstat64 "${_dev}" | $AWK_PROG '/Device type:/ { print $9 }'
+    if [ -b "$dev" ]; then
+        src/lstat64 "$dev" | $AWK_PROG '/Device type:/ { print $9 }'
     fi
 }
 
@@ -1329,13 +1315,13 @@ _is_char_dev()
                exit 1
        fi
 
-       _dev=$1
-       if [ -L "${_dev}" ]; then
-               _dev=`readlink -f "${_dev}"`
+       local dev=$1
+       if [ -L "$dev" ]; then
+               dev=`readlink -f "$dev"`
        fi
 
-       if [ -c "${_dev}" ]; then
-               src/lstat64 "${_dev}" | $AWK_PROG '/Device type:/ { print $9 }'
+       if [ -c "$dev" ]; then
+               src/lstat64 "$dev" | $AWK_PROG '/Device type:/ { print $9 }'
        fi
 }
 
@@ -1352,19 +1338,20 @@ _is_char_dev()
 _do()
 {
     if [ $# -eq 1 ]; then
-       _cmd=$1
+       local cmd=$1
     elif [ $# -eq 2 ]; then
-       _note=$1
-       _cmd=$2
-       echo -n "$_note... "
+       local note=$1
+       local cmd=$2
+       echo -n "$note... "
     else
        echo "Usage: _do [note] cmd" 1>&2
        status=1; exit
     fi
 
-    (eval "echo '---' \"$_cmd\"") >>$seqres.full
-    (eval "$_cmd") >$tmp._out 2>&1; ret=$?
-    cat $tmp._out | _fix_malloc >>$seqres.full
+    (eval "echo '---' \"$cmd\"") >>$seqres.full
+    (eval "$cmd") >$tmp._out 2>&1
+    local ret=$?
+    cat $tmp._out >>$seqres.full
     rm -f $tmp._out
     if [ $# -eq 2 ]; then
        if [ $ret -eq 0 ]; then
@@ -1378,7 +1365,7 @@ _do()
            -o \( $# -eq 2 -a "$_do_die_on_error" = "message_only" \) ]
     then
        [ $# -ne 2 ] && echo
-       eval "echo \"$_cmd\" failed \(returned $ret\): see $seqres.full"
+       eval "echo \"$cmd\" failed \(returned $ret\): see $seqres.full"
        status=1; exit
     fi
 
@@ -1413,6 +1400,8 @@ _fail()
 #
 _supported_fs()
 {
+    local f
+
     for f
     do
        if [ "$f" = "$FSTYP" -o "$f" = "generic" ]
@@ -1429,6 +1418,8 @@ _supported_fs()
 #
 _supported_os()
 {
+    local h
+
     for h
     do
        if [ "$h" = "$HOSTOS" ]
@@ -1588,6 +1579,16 @@ _require_scratch()
        touch ${RESULT_DIR}/require_scratch
 }
 
+# require a scratch dev of a minimum size (in kb)
+_require_scratch_size()
+{
+       [ $# -eq 1 ] || _fail "_require_scratch_size: expected size param"
+
+       _require_scratch
+       local devsize=`_get_device_size $SCRATCH_DEV`
+       [ $devsize -lt $1 ] && _notrun "scratch dev too small"
+}
+
 
 # this test needs a test partition - check we're ok & mount it
 #
@@ -1793,16 +1794,16 @@ _require_no_realtime()
 _require_command()
 {
        if [ $# -eq 2 ]; then
-               _name="$2"
+               local name="$2"
        elif [ $# -eq 1 ]; then
-               _name="$1"
+               local name="$1"
        else
                _fail "usage: _require_command <command> [<name>]"
        fi
 
-       _command=`echo "$1" | awk '{ print $1 }'`
-       if [ ! -x "$_command" ]; then
-               _notrun "$_name utility required, skipped this test"
+       local command=`echo "$1" | awk '{ print $1 }'`
+       if [ ! -x "$command" ]; then
+               _notrun "$name utility required, skipped this test"
        fi
 }
 
@@ -1850,7 +1851,7 @@ _require_sane_bdev_flush()
 # this test requires a specific device mapper target
 _require_dm_target()
 {
-       _target=$1
+       local target=$1
 
        # require SCRATCH_DEV to be a valid block device with sane BLKFLSBUF
        # behaviour
@@ -1858,11 +1859,11 @@ _require_dm_target()
        _require_sane_bdev_flush $SCRATCH_DEV
        _require_command "$DMSETUP_PROG" dmsetup
 
-       modprobe dm-$_target >/dev/null 2>&1
+       modprobe dm-$target >/dev/null 2>&1
 
-       $DMSETUP_PROG targets 2>&1 | grep -q ^$_target
+       $DMSETUP_PROG targets 2>&1 | grep -q ^$target
        if [ $? -ne 0 ]; then
-               _notrun "This test requires dm $_target support"
+               _notrun "This test requires dm $target support"
        fi
 }
 
@@ -1872,7 +1873,7 @@ _require_scratch_ext4_crc()
 {
        _scratch_mkfs_ext4 >/dev/null 2>&1
        dumpe2fs -h $SCRATCH_DEV 2> /dev/null | grep -q metadata_csum || _notrun "metadata_csum not supported by this filesystem"
-       _scratch_mount >/dev/null 2>&1 \
+       _try_scratch_mount >/dev/null 2>&1 \
           || _notrun "Kernel doesn't support metadata_csum feature"
        _scratch_unmount
 }
@@ -1888,7 +1889,7 @@ _require_scratch_ext4_feature()
     $MKFS_EXT4_PROG -F $MKFS_OPTIONS -O "$1" \
                    $SCRATCH_DEV 512m >/dev/null 2>&1 \
        || _notrun "mkfs.ext4 doesn't support $1 feature"
-    _scratch_mount >/dev/null 2>&1 \
+    _try_scratch_mount >/dev/null 2>&1 \
        || _notrun "Kernel doesn't support the ext4 feature(s): $1"
     _scratch_unmount
 }
@@ -1940,8 +1941,8 @@ _require_aiodio()
 #
 _require_test_program()
 {
-    SRC_TEST=src/$1
-    [ -x $SRC_TEST ] || _notrun "$SRC_TEST not built"
+    local prog=src/$1
+    [ -x $prog ] || _notrun "$prog not built"
 }
 
 # run an aio-dio program
@@ -1985,7 +1986,7 @@ _require_y2038()
 
 _filesystem_timestamp_range()
 {
-       device=${1:-$TEST_DEV}
+       local device=${1:-$TEST_DEV}
        case $FSTYP in
        ext4)
                if [ $(dumpe2fs -h $device 2>/dev/null | grep "Inode size:" | cut -d: -f2) -gt 128 ]; then
@@ -2016,7 +2017,8 @@ _yp_active()
 {
        local dn
        dn=$(domainname 2>/dev/null)
-       test -n "${dn}" -a "${dn}" != "(none)" -a "${dn}" != "localdomain"
+       local ypcat=$(type -P ypcat)
+       test -n "${dn}" -a "${dn}" != "(none)" -a "${dn}" != "localdomain" -a -n "${ypcat}"
        echo $?
 }
 
@@ -2090,13 +2092,14 @@ _require_xfs_io_command()
        local param_checked=0
        local opts=""
 
-       testfile=$TEST_DIR/$$.xfs_io
+       local testfile=$TEST_DIR/$$.xfs_io
+       local testio
        case $command in
        "chproj")
                testio=`$XFS_IO_PROG -F -f -c "chproj 0" $testfile 2>&1`
                ;;
        "copy_range")
-               testcopy=$TEST_DIR/$$.copy.xfs_io
+               local testcopy=$TEST_DIR/$$.copy.xfs_io
                $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`
                rm -f $testcopy > /dev/null 2>&1
@@ -2106,8 +2109,10 @@ _require_xfs_io_command()
                param_checked=1
                ;;
        "fpunch" | "fcollapse" | "zero" | "fzero" | "finsert" | "funshare")
-               testio=`$XFS_IO_PROG -F -f -c "pwrite 0 20k" -c "fsync" \
-                       -c "$command 4k 8k" $testfile 2>&1`
+               local blocksize=$(_get_block_size $TEST_DIR)
+               testio=`$XFS_IO_PROG -F -f -c "pwrite 0 $((5 * $blocksize))" \
+                       -c "fsync" -c "$command $blocksize $((2 * $blocksize))" \
+                       $testfile 2>&1`
                ;;
        "fiemap")
                # If 'ranged' is passed as argument then we check to see if fiemap supports
@@ -2202,7 +2207,7 @@ _require_odirect()
                        _notrun "ext4 data journaling doesn't support O_DIRECT"
                fi
        fi
-       testfile=$TEST_DIR/$$.direct
+       local testfile=$TEST_DIR/$$.direct
        $XFS_IO_PROG -F -f -d -c "pwrite 0 20k" $testfile > /dev/null 2>&1
        if [ $? -ne 0 ]; then
                _notrun "O_DIRECT is not supported"
@@ -2236,13 +2241,13 @@ _require_scratch_swapfile()
 #
 _require_fs_space()
 {
-       MNT=$1
-       BLOCKS=$2       # in units of 1024
-       let GB=$BLOCKS/1024/1024
+       local mnt=$1
+       local blocks=$2 # in units of 1024
+       local gb=$(( blocks / 1024 / 1024 ))
 
-       FREE_BLOCKS=`df -kP $MNT | grep -v Filesystem | awk '{print $4}'`
-       [ $FREE_BLOCKS -lt $BLOCKS ] && \
-               _notrun "This test requires at least ${GB}GB free on $MNT to run"
+       local free_blocks=`df -kP $mnt | grep -v Filesystem | awk '{print $4}'`
+       [ $free_blocks -lt $blocks ] && \
+               _notrun "This test requires at least ${gb}GB free on $mnt to run"
 }
 
 #
@@ -2322,7 +2327,7 @@ _require_scratch_richacl_xfs()
        _scratch_mkfs_xfs_supported -m richacl=1 >/dev/null 2>&1 \
                || _notrun "mkfs.xfs doesn't have richacl feature"
        _scratch_mkfs_xfs -m richacl=1 >/dev/null 2>&1
-       _scratch_mount >/dev/null 2>&1 \
+       _try_scratch_mount >/dev/null 2>&1 \
                || _notrun "kernel doesn't support richacl feature on $FSTYP"
        _scratch_unmount
 }
@@ -2331,7 +2336,7 @@ _require_scratch_richacl_ext4()
 {
        _scratch_mkfs -O richacl >/dev/null 2>&1 \
                || _notrun "can't mkfs $FSTYP with option -O richacl"
-       _scratch_mount >/dev/null 2>&1 \
+       _try_scratch_mount >/dev/null 2>&1 \
                || _notrun "kernel doesn't support richacl feature on $FSTYP"
        _scratch_unmount
 }
@@ -2372,27 +2377,32 @@ _scratch_mkfs_richacl()
        esac
 }
 
-# check that a FS on a device is mounted
-# if so, return mount point
-#
-_is_mounted()
+# check if the given device is mounted, if so, return mount point
+_is_dev_mounted()
 {
-    if [ $# -ne 1 ]
-    then
-       echo "Usage: _is_mounted device" 1>&2
-       exit 1
-    fi
+       local dev=$1
+       local fstype=${2:-$FSTYP}
 
-    device=$1
+       if [ $# -lt 1 ]; then
+               echo "Usage: _is_dev_mounted <device> [fstype]" 1>&2
+               exit 1
+       fi
 
-    if _mount | grep "$device " | $AWK_PROG -v pattern="type $FSTYP" '
-        pattern        { print $3 ; exit 0 }
-        END            { exit 1 }
-    '
-    then
-        echo "_is_mounted: $device is not a mounted $FSTYP FS"
-        exit 1
-    fi
+       findmnt -rncv -S $dev -t $fstype -o TARGET | head -1
+}
+
+# check if the given dir is a mount point, if so, return mount point
+_is_dir_mountpoint()
+{
+       local dir=$1
+       local fstype=${2:-$FSTYP}
+
+       if [ $# -lt 1 ]; then
+               echo "Uasge: _is_dir_mountpoint <dir> [fstype]" 1>&2
+               exit 1
+       fi
+
+       findmnt -rncv -t $fstype -o TARGET $dir | head -1
 }
 
 # remount a FS to a new mode (ro or rw)
@@ -2404,8 +2414,8 @@ _remount()
        echo "Usage: _remount device ro/rw" 1>&2
        exit 1
     fi
-    device=$1
-    mode=$2
+    local device=$1
+    local mode=$2
 
     if ! mount -o remount,$mode $device
     then
@@ -2431,8 +2441,8 @@ _umount_or_remount_ro()
        exit 1
     fi
 
-    device=$1
-    mountpoint=`_is_mounted $device`
+    local device=$1
+    local mountpoint=`_is_dev_mounted $device`
 
     if [ $USE_REMOUNT -eq 0 ]; then
         $UMOUNT_PROG $device
@@ -2448,9 +2458,9 @@ _mount_or_remount_rw()
                echo "Usage: _mount_or_remount_rw <opts> <dev> <mnt>" 1>&2
                exit 1
        fi
-       mount_opts=$1
-       device=$2
-       mountpoint=$3
+       local mount_opts=$1
+       local device=$2
+       local mountpoint=$3
 
        if [ $USE_REMOUNT -eq 0 ]; then
                if [ "$FSTYP" != "overlay" ]; then
@@ -2478,16 +2488,16 @@ _mount_or_remount_rw()
 #
 _check_generic_filesystem()
 {
-    device=$1
+    local device=$1
 
     # If type is set, we're mounted
-    type=`_fs_type $device`
-    ok=1
+    local type=`_fs_type $device`
+    local ok=1
 
     if [ "$type" = "$FSTYP" ]
     then
         # mounted ...
-        mountpoint=`_umount_or_remount_ro $device`
+        local mountpoint=`_umount_or_remount_ro $device`
     fi
 
     fsck -t $FSTYP $FSCK_OPTIONS $device >$tmp.fsck 2>&1
@@ -2552,16 +2562,15 @@ _check_udf_filesystem()
        return
     fi
 
-    device=$1
-    if [ $# -eq 2 ];
-    then
-        LAST_BLOCK=`expr \( $2 - 1 \)`
-        OPT_ARG="-lastvalidblock $LAST_BLOCK"
+    local device=$1
+    local opt_arg=""
+    if [ $# -eq 2 ]; then
+       opt_arg="-lastvalidblock $(( $2 - 1 ))"
     fi
 
     rm -f $seqres.checkfs
     sleep 1 # Due to a problem with time stamps in udf_test
-    $here/src/udf_test $OPT_ARG $device | tee $seqres.checkfs | egrep "Error|Warning" | \
+    $here/src/udf_test $opt_arg $device | tee $seqres.checkfs | egrep "Error|Warning" | \
        _udf_test_known_error_filter | \
        egrep -iv "Error count:.*[0-9]+.*total occurrences:.*[0-9]+|Warning count:.*[0-9]+.*total occurrences:.*[0-9]+" && \
         echo "Warning UDF Verifier reported errors see $seqres.checkfs." && return 1
@@ -2590,7 +2599,7 @@ _check_test_fs()
        # no way to check consistency for GlusterFS
        ;;
     overlay)
-       # no way to check consistency for overlay
+       _check_overlay_test_fs
        ;;
     pvfs2)
        ;;
@@ -2614,20 +2623,20 @@ _check_test_fs()
 
 _check_scratch_fs()
 {
-    device=$SCRATCH_DEV
+    local device=$SCRATCH_DEV
     [ $# -eq 1 ] && device=$1
 
     case $FSTYP in
     xfs)
-       SCRATCH_LOG="none"
-       SCRATCH_RT="none"
+       local scratch_log="none"
+       local scratch_rt="none"
        [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
-           SCRATCH_LOG="$SCRATCH_LOGDEV"
+           scratch_log="$SCRATCH_LOGDEV"
 
        [ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_RTDEV" ] && \
-           SCRATCH_RT="$SCRATCH_RTDEV"
+           scratch_rt="$SCRATCH_RTDEV"
 
-       _check_xfs_filesystem $device $SCRATCH_LOG $SCRATCH_RT
+       _check_xfs_filesystem $device $scratch_log $scratch_rt
        ;;
     udf)
        _check_udf_filesystem $device $udf_fsize
@@ -2648,7 +2657,7 @@ _check_scratch_fs()
        # no way to check consistency for GlusterFS
        ;;
     overlay)
-       # no way to check consistency for overlay
+       _check_overlay_scratch_fs
        ;;
     pvfs2)
        ;;
@@ -2690,10 +2699,10 @@ _full_fstyp_details()
 
 _full_platform_details()
 {
-     os=`uname -s`
-     host=`hostname -s`
-     kernel=`uname -r`
-     platform=`uname -m`
+     local os=`uname -s`
+     local host=`hostname -s`
+     local kernel=`uname -r`
+     local platform=`uname -m`
      echo "$os/$platform $host $kernel"
 }
 
@@ -2709,8 +2718,8 @@ _get_os_name()
 
 _link_out_file_named()
 {
-       export FEATURES=$2
-       SUFFIX=$(perl -e '
+       local features=$2
+       local suffix=$(FEATURES="$features" perl -e '
                my %feathash;
                my $feature, $result, $suffix, $opts;
 
@@ -2737,22 +2746,23 @@ _link_out_file_named()
                print $result
                ' <$seqfull.cfg)
        rm -f $1
-       SRC=$(basename $1)
-       ln -fs $SRC.$SUFFIX $1
+       ln -fs $(basename $1).$suffix $1
 }
 
 _link_out_file()
 {
+       local features
+
        if [ $# -eq 0 ]; then
-               FEATURES="$(_get_os_name)"
+               features="$(_get_os_name)"
                if [ -n "$MOUNT_OPTIONS" ]; then
-                       FEATURES=$FEATURES,${MOUNT_OPTIONS##"-o "}
+                       features=$features,${MOUNT_OPTIONS##"-o "}
                fi
        else
-               FEATURES=$1
+               features=$1
        fi
 
-       _link_out_file_named $seqfull.out "$FEATURES"
+       _link_out_file_named $seqfull.out "$features"
 }
 
 _die()
@@ -2770,10 +2780,10 @@ _ddt()
 #takes files, randomdata
 _nfiles()
 {
-        f=0
+        local f=0
         while [ $f -lt $1 ]
         do
-                file=f$f
+                local file=f$f
                 echo > $file
                 if [ $size -gt 0 ]; then
                     if [ "$2" == "false" ]; then
@@ -2791,18 +2801,18 @@ _nfiles()
 # takes dirname, depth, randomdata
 _descend()
 {
-        dirname=$1; depth=$2; randomdata=$3
+        local dirname=$1 depth=$2 randomdata=$3
         mkdir $dirname  || die "mkdir $dirname failed"
         cd $dirname
 
         _nfiles $files $randomdata          # files for this dir and data type
 
         [ $depth -eq 0 ] && return
-       let deep=$depth-1 # go 1 down
+        local deep=$(( depth - 1 )) # go 1 down
 
         [ $verbose = true ] && echo "descending, depth from leaves = $deep"
 
-        d=0
+        local d=0
         while [ $d -lt $dirs ]
         do
                 _descend d$d $deep &
@@ -2817,14 +2827,15 @@ _descend()
 #
 _populate_fs()
 {
-    here=`pwd`
-    dirs=5          # ndirs in each subdir till leaves
-    size=0          # sizeof files in K
-    files=100       # num files in _each_ subdir
-    depth=2         # depth of tree from root to leaves
-    verbose=false
-    root=root       # path of initial root of directory tree
-    randomdata=false # -x data type urandom, zero or compressible
+    local here=`pwd`
+    local dirs=5          # ndirs in each subdir till leaves
+    local size=0          # sizeof files in K
+    local files=100       # num files in _each_ subdir
+    local depth=2         # depth of tree from root to leaves
+    local verbose=false
+    local root=root       # path of initial root of directory tree
+    local randomdata=false # -x data type urandom, zero or compressible
+    local c
 
     OPTIND=1
     while getopts "d:f:n:r:s:v:x:c" c
@@ -2853,8 +2864,8 @@ _populate_fs()
 #
 _test_inode_flag()
 {
-       flag=$1
-       file=$2
+       local flag=$1
+       local file=$2
 
        if $XFS_IO_PROG -r -c 'lsattr -v' "$file" | grep -q "$flag" ; then
                return 0
@@ -2866,8 +2877,8 @@ _test_inode_flag()
 #
 _test_inode_extsz()
 {
-       file=$1
-       blocks=""
+       local file=$1
+       local blocks=""
 
        blocks=`$XFS_IO_PROG -r -c 'stat' "$file" | \
                awk '/^xattr.extsize =/ { print $3 }'`
@@ -2927,15 +2938,15 @@ _require_scratch_dev_pool()
 # must be called after _require_scratch_dev_pool
 _require_scratch_dev_pool_equal_size()
 {
-       local _size
-       local _newsize
-       local _dev
+       local size
+       local newsize
+       local dev
 
        # SCRATCH_DEV has been set to the first device in SCRATCH_DEV_POOL
-       _size=`_get_device_size $SCRATCH_DEV`
-       for _dev in $SCRATCH_DEV_POOL; do
-               _newsize=`_get_device_size $_dev`
-               if [ $_size -ne $_newsize ]; then
+       size=`_get_device_size $SCRATCH_DEV`
+       for dev in $SCRATCH_DEV_POOL; do
+               newsize=`_get_device_size $dev`
+               if [ $size -ne $newsize ]; then
                        _notrun "This test requires devices in SCRATCH_DEV_POOL have the same size"
                fi
        done
@@ -2957,7 +2968,7 @@ _require_deletable_scratch_dev_pool()
 # Check that fio is present, and it is able to execute given jobfile
 _require_fio()
 {
-       job=$1
+       local job=$1
 
        _require_command "$FIO_PROG" fio
        if [ -z "$1" ]; then
@@ -2972,7 +2983,7 @@ _require_fio()
 _require_freeze()
 {
        xfs_freeze -f "$TEST_DIR" >/dev/null 2>&1
-       result=$? 
+       local result=$?
        xfs_freeze -u "$TEST_DIR" >/dev/null 2>&1
        [ $result -eq 0 ] || _notrun "$FSTYP does not support freezing"
 }
@@ -2993,7 +3004,7 @@ _require_scratch_shutdown()
        [ -x src/godown ] || _notrun "src/godown executable not found"
 
        _scratch_mkfs > /dev/null 2>&1 || _notrun "_scratch_mkfs failed on $SCRATCH_DEV"
-       _scratch_mount || _notrun "_scratch_mount failed on $SCRATCH_MNT"
+       _scratch_mount
 
        if [ $FSTYP = "overlay" ]; then
                if [ -z $OVL_BASE_SCRATCH_DEV ]; then
@@ -3019,7 +3030,8 @@ _require_scratch_dax()
 {
        _require_scratch
        _scratch_mkfs > /dev/null 2>&1
-       _scratch_mount -o dax
+       _try_scratch_mount -o dax || \
+               _notrun "mount $SCRATCH_DEV with dax failed"
        # Check options to be sure. XFS ignores dax option
        # and goes on if dev underneath does not support dax.
        _fs_options $SCRATCH_DEV | grep -qw "dax" || \
@@ -3030,7 +3042,7 @@ _require_scratch_dax()
 # Does norecovery support by this fs?
 _require_norecovery()
 {
-       _scratch_mount -o ro,norecovery || \
+       _try_scratch_mount -o ro,norecovery || \
                _notrun "$FSTYP does not support norecovery"
        _scratch_unmount
 }
@@ -3046,9 +3058,9 @@ _require_norecovery()
 _require_metadata_journaling()
 {
        if [ -z $1 ]; then
-               DEV=$TEST_DEV
+               local dev=$TEST_DEV
        else
-               DEV=$1
+               local dev=$1
        fi
 
        case "$FSTYP" in
@@ -3058,8 +3070,8 @@ _require_metadata_journaling()
        ext4)
                # ext4 could be mkfs'd without a journal...
                _require_dumpe2fs
-               $DUMPE2FS_PROG -h $DEV 2>&1 | grep -q has_journal || \
-                       _notrun "$FSTYP on $DEV not configured with metadata journaling"
+               $DUMPE2FS_PROG -h $dev 2>&1 | grep -q has_journal || \
+                       _notrun "$FSTYP on $dev not configured with metadata journaling"
                # ext4 might not load a journal
                _exclude_scratch_mount_option "noload"
                ;;
@@ -3125,10 +3137,12 @@ _devmgt_add()
        echo ${tdl} >  /sys/class/scsi_host/host${h}/scan || _fail "Add disk failed"
 
        # ensure the device comes online
-       dev_back_oneline=0
+       local dev_back_oneline=0
+       local i
        for i in `seq 1 10`; do
                if [ -d /sys/class/scsi_device/${1}/device/block ]; then
-                       dev=`ls /sys/class/scsi_device/${1}/device/block`
+                       local dev=`ls /sys/class/scsi_device/${1}/device/block`
+                       local j
                        for j in `seq 1 10`;
                        do
                                stat /dev/$dev > /dev/null 2>&1
@@ -3229,7 +3243,7 @@ _require_atime()
 _require_relatime()
 {
         _scratch_mkfs > /dev/null 2>&1
-        _scratch_mount -o relatime || \
+        _try_scratch_mount -o relatime || \
                 _notrun "relatime not supported by the current kernel"
        _scratch_unmount
 }
@@ -3242,20 +3256,20 @@ _require_userns()
 
 _create_loop_device()
 {
-       file=$1
+       local file=$1 dev
        dev=`losetup -f --show $file` || _fail "Cannot assign $file to a loop device"
        echo $dev
 }
 
 _destroy_loop_device()
 {
-       dev=$1
+       local dev=$1
        losetup -d $dev || _fail "Cannot destroy loop device $dev"
 }
 
 _scale_fsstress_args()
 {
-    args=""
+    local args=""
     while [ $# -gt 0 ]; do
         case "$1" in
             -n) args="$args $1 $(($2 * $TIME_FACTOR))"; shift ;;
@@ -3273,7 +3287,7 @@ _scale_fsstress_args()
 #
 _min_dio_alignment()
 {
-    dev=$1
+    local dev=$1
 
     if [ -b "$dev" ]; then
         blockdev --getss $dev
@@ -3290,8 +3304,8 @@ run_check()
 
 _require_test_symlinks()
 {
-       target=`mktemp -p $TEST_DIR`
-       link=`mktemp -p $TEST_DIR -u`
+       local target=`mktemp -p $TEST_DIR`
+       local link=`mktemp -p $TEST_DIR -u`
        ln -s `basename $target` $link
        if [ "$?" -ne 0 ]; then
                rm -f $target
@@ -3321,7 +3335,7 @@ _require_ofd_locks()
 
 _require_test_lsattr()
 {
-       testio=$(lsattr -d $TEST_DIR 2>&1)
+       local testio=$(lsattr -d $TEST_DIR 2>&1)
        echo $testio | grep -q "Operation not supported" && \
                _notrun "lsattr not supported by test filesystem type: $FSTYP"
        echo $testio | grep -q "Inappropriate ioctl for device" && \
@@ -3338,9 +3352,9 @@ _require_chattr()
 
        touch $TEST_DIR/syscalltest
        chattr "+$attribute" $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
-       status=$?
+       local ret=$?
        chattr "-$attribute" $TEST_DIR/syscalltest > $TEST_DIR/syscalltest.out 2>&1
-       if [ "$status" -ne 0 ]; then
+       if [ "$ret" -ne 0 ]; then
                _notrun "file system doesn't support chattr +$attribute"
        fi
        cat $TEST_DIR/syscalltest.out >> $seqres.full
@@ -3411,6 +3425,31 @@ _get_device_size()
        grep `_short_dev $1` /proc/partitions | awk '{print $3}'
 }
 
+# Make sure we actually have dmesg checking set up.
+_require_check_dmesg()
+{
+       test -w /dev/kmsg || \
+               _notrun "Test requires writable /dev/kmsg."
+}
+
+# Return the dmesg log since the start of this test.  Caller must ensure that
+# /dev/kmsg was writable when the test was started so that we can find the
+# beginning of this test's log messages; _require_check_dmesg does this.
+_dmesg_since_test_start()
+{
+       # search the dmesg log of last run of $seqnum for possible failures
+       # use sed \cregexpc address type, since $seqnum contains "/"
+       dmesg | tac | sed -ne "0,\#run fstests $seqnum at $date_time#p" | \
+               tac
+}
+
+# check dmesg log for a specific string, subject to the same requirements as
+# _dmesg_since_test_start.
+_check_dmesg_for()
+{
+       _dmesg_since_test_start | egrep -q "$1"
+}
+
 # check dmesg log for WARNING/Oops/etc.
 _check_dmesg()
 {
@@ -3422,12 +3461,9 @@ _check_dmesg()
        # default filter is a simple cat command, caller could provide a
        # customized filter and pass the name through the first argument, to
        # filter out intentional WARNINGs or Oopses
-       filter=${1:-cat}
+       local filter=${1:-cat}
 
-       # search the dmesg log of last run of $seqnum for possible failures
-       # use sed \cregexpc address type, since $seqnum contains "/"
-       dmesg | tac | sed -ne "0,\#run fstests $seqnum at $date_time#p" | \
-               tac | $filter >$seqres.dmesg
+       _dmesg_since_test_start | $filter >$seqres.dmesg
        egrep -q -e "kernel BUG at" \
             -e "WARNING:" \
             -e "BUG:" \
@@ -3452,59 +3488,59 @@ _check_dmesg()
 # capture the kmemleak report
 _capture_kmemleak()
 {
-       local _kern_knob="${DEBUGFS_MNT}/kmemleak"
-       local _leak_file="$1"
+       local kern_knob="${DEBUGFS_MNT}/kmemleak"
+       local leak_file="$1"
 
        # Tell the kernel to scan for memory leaks.  Apparently the write
        # returns before the scan is complete, so do it twice in the hopes
        # that twice is enough to capture all the leaks.
-       echo "scan" > "${_kern_knob}"
-       cat "${_kern_knob}" > /dev/null
-       echo "scan" > "${_kern_knob}"
-       cat "${_kern_knob}" > "${_leak_file}.tmp"
-       if [ -s "${_leak_file}.tmp" ]; then
-               cat > "${_leak_file}" << ENDL
+       echo "scan" > "$kern_knob"
+       cat "$kern_knob" > /dev/null
+       echo "scan" > "$kern_knob"
+       cat "$kern_knob" > "$leak_file.tmp"
+       if [ -s "$leak_file.tmp" ]; then
+               cat > "$leak_file" << ENDL
 EXPERIMENTAL kmemleak reported some memory leaks!  Due to the way kmemleak
 works, the leak might be from an earlier test, or something totally unrelated.
 ENDL
-               cat "${_leak_file}.tmp" >> "${_leak_file}"
-               rm -rf "${_leak_file}.tmp"
+               cat "$leak_file.tmp" >> "$leak_file"
        fi
-       echo "clear" > "${_kern_knob}"
+       rm -rf "$leak_file.tmp"
+       echo "clear" > "$kern_knob"
 }
 
 # set up kmemleak
 _init_kmemleak()
 {
-       local _kern_knob="${DEBUGFS_MNT}/kmemleak"
+       local kern_knob="${DEBUGFS_MNT}/kmemleak"
 
-       if [ ! -w "${_kern_knob}" ]; then
+       if [ ! -w "$kern_knob" ]; then
                return 0
        fi
 
        # Disable the automatic scan so that we can control it completely,
        # then dump all the leaks recorded so far.
-       echo "scan=off" > "${_kern_knob}"
+       echo "scan=off" > "$kern_knob"
        _capture_kmemleak /dev/null
 }
 
 # check kmemleak log
 _check_kmemleak()
 {
-       local _kern_knob="${DEBUGFS_MNT}/kmemleak"
-       local _leak_file="${seqres}.kmemleak"
+       local kern_knob="${DEBUGFS_MNT}/kmemleak"
+       local leak_file="${seqres}.kmemleak"
 
-       if [ ! -w "${_kern_knob}" ]; then
+       if [ ! -w "$kern_knob" ]; then
                return 0
        fi
 
        # Capture and report any leaks
-       _capture_kmemleak "${_leak_file}"
-       if [ -s "${_leak_file}" ]; then
-               _dump_err "_check_kmemleak: something found in kmemleak (see ${_leak_file})"
+       _capture_kmemleak "$leak_file"
+       if [ -s "$leak_file" ]; then
+               _dump_err "_check_kmemleak: something found in kmemleak (see $leak_file)"
                return 1
        else
-               rm -f "${_leak_file}"
+               rm -f "$leak_file"
                return 0
        fi
 }
@@ -3585,11 +3621,11 @@ init_rc()
 # get real device path name by following link
 _real_dev()
 {
-       local _dev=$1
-       if [ -b "$_dev" ] && [ -L "$_dev" ]; then
-               _dev=`readlink -f "$_dev"`
+       local dev=$1
+       if [ -b "$dev" ] && [ -L "$dev" ]; then
+               dev=`readlink -f "$dev"`
        fi
-       echo $_dev
+       echo $dev
 }
 
 # basename of a device
@@ -3600,12 +3636,12 @@ _short_dev()
 
 _sysfs_dev()
 {
-       local _dev=`_real_dev $1`
-       local _maj=$(stat -c%t $_dev | tr [:lower:] [:upper:])
-       local _min=$(stat -c%T $_dev | tr [:lower:] [:upper:])
-       _maj=$(echo "ibase=16; $_maj" | bc)
-       _min=$(echo "ibase=16; $_min" | bc)
-       echo /sys/dev/block/$_maj:$_min
+       local dev=`_real_dev $1`
+       local maj=$(stat -c%t $dev | tr [:lower:] [:upper:])
+       local min=$(stat -c%T $dev | tr [:lower:] [:upper:])
+       maj=$(echo "ibase=16; $maj" | bc)
+       min=$(echo "ibase=16; $min" | bc)
+       echo /sys/dev/block/$maj:$min
 }
 
 # Get the minimum block size of a file.  Usually this is the
@@ -3643,7 +3679,7 @@ get_page_size()
 run_fsx()
 {
        echo fsx $@
-       args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
+       local args=`echo $@ | sed -e "s/ BSIZE / $bsize /g" -e "s/ PSIZE / $psize /g"`
        set -- $here/ltp/fsx $args $FSX_AVOID $TEST_DIR/junk
        echo "$@" >>$seqres.full
        rm -f $TEST_DIR/junk