@@ -352,7 +352,7 @@ _btrfs_stress_subvolume()
while [ ! -e $stop_file ]; do
$BTRFS_UTIL_PROG subvolume create $btrfs_mnt/$subvol_name
_mount -o subvol=$subvol_name $btrfs_dev $subvol_mnt
- $UMOUNT_PROG $subvol_mnt
+ _umount $subvol_mnt
$BTRFS_UTIL_PROG subvolume delete $btrfs_mnt/$subvol_name
done
}
@@ -26,7 +26,7 @@ _mount_delay()
_unmount_delay()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
_cleanup_delay()
@@ -34,7 +34,7 @@ _cleanup_delay()
# If dmsetup load fails then we need to make sure to do resume here
# otherwise the umount will hang
$DMSETUP_PROG resume delay-test > /dev/null 2>&1
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove delay-test
}
@@ -22,7 +22,7 @@ _mount_dust()
_unmount_dust()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
_cleanup_dust()
@@ -30,6 +30,6 @@ _cleanup_dust()
# If dmsetup load fails then we need to make sure to do resume here
# otherwise the umount will hang
$DMSETUP_PROG resume dust-test > /dev/null 2>&1
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove dust-test
}
@@ -106,7 +106,7 @@ _dmerror_cleanup()
test -n "$NON_ERROR_RTDEV" && $DMSETUP_PROG resume error-rttest &>/dev/null
$DMSETUP_PROG resume error-test > /dev/null 2>&1
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
test -n "$NON_ERROR_LOGDEV" && _dmsetup_remove error-logtest
test -n "$NON_ERROR_RTDEV" && _dmsetup_remove error-rttest
@@ -67,7 +67,7 @@ _mount_flakey()
_unmount_flakey()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
_cleanup_flakey()
@@ -78,7 +78,7 @@ _cleanup_flakey()
test -n "$NON_FLAKEY_RTDEV" && $DMSETUP_PROG resume flakey-rttest &> /dev/null
$DMSETUP_PROG resume flakey-test > /dev/null 2>&1
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove flakey-test
test -n "$NON_FLAKEY_LOGDEV" && _dmsetup_remove flakey-logtest
@@ -39,7 +39,7 @@ _dmhugedisk_init()
_dmhugedisk_cleanup()
{
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove huge-test
_dmsetup_remove huge-test-zero
}
@@ -145,7 +145,7 @@ _log_writes_mount()
_log_writes_unmount()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# _log_writes_replay_log <mark>
@@ -177,7 +177,7 @@ _log_writes_remove()
_log_writes_cleanup()
{
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_log_writes_remove
}
@@ -23,7 +23,7 @@ DMTHIN_VOL_DEV="/dev/mapper/$DMTHIN_VOL_NAME"
_dmthin_cleanup()
{
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_dmsetup_remove $DMTHIN_VOL_NAME
_dmsetup_remove $DMTHIN_POOL_NAME
_dmsetup_remove $DMTHIN_META_NAME
@@ -32,7 +32,7 @@ _dmthin_cleanup()
_dmthin_check_fs()
{
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
_check_scratch_fs $DMTHIN_VOL_DEV
}
@@ -142,18 +142,18 @@ _overlay_base_unmount()
[ -n "$dev" -a -n "$mnt" ] || return 0
- $UMOUNT_PROG $mnt
+ _umount $mnt
}
_overlay_test_unmount()
{
- $UMOUNT_PROG $TEST_DIR
+ _umount $TEST_DIR
_overlay_base_unmount "$OVL_BASE_TEST_DEV" "$OVL_BASE_TEST_DIR"
}
_overlay_scratch_unmount()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_base_unmount "$OVL_BASE_SCRATCH_DEV" "$OVL_BASE_SCRATCH_MNT"
}
@@ -342,7 +342,7 @@ _overlay_check_scratch_dirs()
# Need to umount overlay for scratch dir check
local ovl_mounted=`_is_dir_mountpoint $SCRATCH_MNT`
- [ -z "$ovl_mounted" ] || $UMOUNT_PROG $SCRATCH_MNT
+ [ -z "$ovl_mounted" ] || _umount $SCRATCH_MNT
# Check dirs with extra overlay options
_overlay_check_dirs $lowerdir $upperdir $workdir $*
@@ -387,7 +387,7 @@ _overlay_check_fs()
else
# Check and umount overlay for dir check
ovl_mounted=`_is_dir_mountpoint $ovl_mnt`
- [ -z "$ovl_mounted" ] || $UMOUNT_PROG $ovl_mnt
+ [ -z "$ovl_mounted" ] || _umount $ovl_mnt
fi
_overlay_check_dirs $base_mnt/$OVL_LOWER $base_mnt/$OVL_UPPER \
@@ -233,6 +233,11 @@ _mount()
return $ret
}
+_umount()
+{
+ $UMOUNT_PROG $*
+}
+
# Call _mount to do mount operation but also save mountpoint to
# MOUNTED_POINT_STACK. Note that the mount point must be the last parameter
_get_mount()
@@ -266,7 +271,7 @@ _put_mount()
local last_mnt=`echo $MOUNTED_POINT_STACK | awk '{print $1}'`
if [ -n "$last_mnt" ]; then
- $UMOUNT_PROG $last_mnt
+ _umount $last_mnt
fi
MOUNTED_POINT_STACK=`echo $MOUNTED_POINT_STACK | cut -d\ -f2-`
}
@@ -275,7 +280,7 @@ _put_mount()
_clear_mount_stack()
{
if [ -n "$MOUNTED_POINT_STACK" ]; then
- $UMOUNT_PROG $MOUNTED_POINT_STACK
+ _umount $MOUNTED_POINT_STACK
fi
MOUNTED_POINT_STACK=""
}
@@ -420,20 +425,20 @@ _scratch_unmount()
_overlay_scratch_unmount
;;
btrfs)
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
;;
tmpfs)
$UMOUNT_PROG $SCRATCH_MNT
;;
*)
- $UMOUNT_PROG $SCRATCH_DEV
+ _umount $SCRATCH_DEV
;;
esac
}
_scratch_umount_idmapped()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
_scratch_remount()
@@ -457,7 +462,7 @@ _scratch_cycle_mount()
;;
overlay)
if [ "$OVL_BASE_FSTYP" = tmpfs ]; then
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
unmounted=true
fi
;;
@@ -505,9 +510,9 @@ _move_mount()
# Replace $mnt with $tmp. Use a temporary bind-mount because
# mount --move will fail with certain mount propagation layouts.
- $UMOUNT_PROG $mnt || _fail "Failed to unmount $mnt"
+ _umount $mnt || _fail "Failed to unmount $mnt"
_mount --bind $tmp $mnt || _fail "Failed to bind-mount $tmp to $mnt"
- $UMOUNT_PROG $tmp || _fail "Failed to unmount $tmp"
+ _umount $tmp || _fail "Failed to unmount $tmp"
rmdir $tmp
}
@@ -573,7 +578,7 @@ _test_unmount()
if [ "$FSTYP" == "overlay" ]; then
_overlay_test_unmount
else
- $UMOUNT_PROG $TEST_DEV
+ _umount $TEST_DEV
fi
}
@@ -587,7 +592,7 @@ _test_cycle_mount()
;;
overlay)
if [ "$OVL_BASE_FSTYP" = tmpfs ]; then
- $UMOUNT_PROG $TEST_DIR
+ _umount $TEST_DIR
unmounted=true
fi
;;
@@ -1375,7 +1380,7 @@ _repair_scratch_fs()
# Fall through to repair base fs
dev=$OVL_BASE_SCRATCH_DEV
fstyp=$OVL_BASE_FSTYP
- $UMOUNT_PROG $OVL_BASE_SCRATCH_MNT
+ _umount $OVL_BASE_SCRATCH_MNT
fi
# Let's hope fsck -y suffices...
fsck -t $fstyp -y $dev 2>&1
@@ -2189,7 +2194,7 @@ _require_logdev()
_notrun "This test requires USE_EXTERNAL to be enabled"
# ensure its not mounted
- $UMOUNT_PROG $SCRATCH_LOGDEV 2>/dev/null
+ _umount $SCRATCH_LOGDEV 2>/dev/null
}
# This test requires that an external log device is not in use
@@ -3281,7 +3286,7 @@ _umount_or_remount_ro()
local mountpoint=`_is_dev_mounted $device`
if [ $USE_REMOUNT -eq 0 ]; then
- $UMOUNT_PROG $device
+ _umount $device
else
_remount $device ro
fi
@@ -3799,7 +3804,7 @@ _require_scratch_dev_pool()
_notrun "$i is part of TEST_DEV, this test requires unique disks"
fi
if _mount | grep -q $i; then
- if ! $UMOUNT_PROG $i; then
+ if ! _umount $i; then
echo "failed to unmount $i - aborting"
exit 1
fi
@@ -17,7 +17,7 @@ _cleanup()
{
cd /
rm -f $tmp.*
- $UMOUNT_PROG $loop_mnt
+ _umount $loop_mnt
_destroy_loop_device $loop_dev1
losetup -d $loop_dev2 >/dev/null 2>&1
_destroy_loop_device $loop_dev3
@@ -74,7 +74,7 @@ cp --reflink=always $orig_file $copy_file >> $seqres.full 2>&1 || echo "cp refli
md5sum $orig_file | _filter_testdir_and_scratch
md5sum $copy_file | _filter_testdir_and_scratch
-$UMOUNT_PROG $reflink_test_dir
+_umount $reflink_test_dir
# success, all done
status=0
@@ -99,7 +99,7 @@ mv $testdir2/file* $subvol2/
echo "Verify the file contents:"
_checksum_files
-$UMOUNT_PROG $cross_mount_test_dir
+_umount $cross_mount_test_dir
# success, all done
status=0
@@ -82,7 +82,7 @@ run_test()
fi
# in case the subvolume is still mounted
- $UMOUNT_PROG $subvol_mnt >/dev/null 2>&1
+ _umount $subvol_mnt >/dev/null 2>&1
_scratch_unmount
# we called _require_scratch_nocheck instead of _require_scratch
# do check after test for each profile config
@@ -90,7 +90,7 @@ run_test()
fi
# in case the subvolume is still mounted
- $UMOUNT_PROG $subvol_mnt >/dev/null 2>&1
+ _umount $subvol_mnt >/dev/null 2>&1
_scratch_unmount
# we called _require_scratch_nocheck instead of _require_scratch
# do check after test for each profile config
@@ -82,7 +82,7 @@ run_test()
fi
# in case the subvolume is still mounted
- $UMOUNT_PROG $subvol_mnt >/dev/null 2>&1
+ _umount $subvol_mnt >/dev/null 2>&1
_scratch_unmount
# we called _require_scratch_nocheck instead of _require_scratch
# do check after test for each profile config
@@ -83,7 +83,7 @@ run_test()
fi
# in case the subvolume is still mounted
- $UMOUNT_PROG $subvol_mnt >/dev/null 2>&1
+ _umount $subvol_mnt >/dev/null 2>&1
_scratch_unmount
# we called _require_scratch_nocheck instead of _require_scratch
# do check after test for each profile config
@@ -83,7 +83,7 @@ run_test()
fi
# in case the subvolume is still mounted
- $UMOUNT_PROG $subvol_mnt >/dev/null 2>&1
+ _umount $subvol_mnt >/dev/null 2>&1
_scratch_unmount
# we called _require_scratch_nocheck instead of _require_scratch
# do check after test for each profile config
@@ -15,7 +15,7 @@ _cleanup()
{
cd /
rm -f $tmp.*
- $UMOUNT_PROG $subvol_mnt >/dev/null 2>&1
+ _umount $subvol_mnt >/dev/null 2>&1
}
. ./common/filter
@@ -35,7 +35,7 @@ mount --bind "$SCRATCH_MNT/testvol/testdir" "$SCRATCH_MNT/testvol/mnt"
$BTRFS_UTIL_PROG subvolume delete "$SCRATCH_MNT/testvol" >>$seqres.full 2>&1
# Unmount the bind mount, which should still be alive.
-$UMOUNT_PROG "$SCRATCH_MNT/testvol/mnt"
+_umount "$SCRATCH_MNT/testvol/mnt"
echo "Silence is golden"
status=0
@@ -132,7 +132,7 @@ if [ "$checkpoint1" != "$checkpoint3" ]; then
echo "Inital sum does not match with data on dev2 written by balance"
fi
-$UMOUNT_PROG $dev2
+_umount $dev2
_scratch_dev_pool_put
_btrfs_rescan_devices
_test_mount
@@ -144,7 +144,7 @@ if [ "$checkpoint1" != "$checkpoint3" ]; then
echo "Inital sum does not match with data on dev2 written by balance"
fi
-$UMOUNT_PROG $dev2
+_umount $dev2
_scratch_dev_pool_put
_btrfs_rescan_devices
_test_mount
@@ -15,7 +15,7 @@ mnt=$TEST_DIR/$seq.mnt
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $mnt > /dev/null 2>&1
+ _umount $mnt > /dev/null 2>&1
rm -rf $mnt > /dev/null 2>&1
cd /
rm -f $tmp.*
@@ -62,7 +62,7 @@ $BTRFS_UTIL_PROG device scan $device_1 >> $seqres.full 2>&1
_fail "if it fails here, then it means subvolume mount at boot may fail "\
"in some configs."
-$UMOUNT_PROG $mnt > /dev/null 2>&1
+_umount $mnt > /dev/null 2>&1
_scratch_dev_pool_put
# success, all done
@@ -15,7 +15,7 @@ _begin_fstest auto quick volume
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $TEST_DIR/$seq.mnt >/dev/null 2>&1
+ _umount $TEST_DIR/$seq.mnt >/dev/null 2>&1
rm -rf $TEST_DIR/$seq.mnt
cd /
rm -f $tmp.*
@@ -67,7 +67,7 @@ workout()
grep -q "${SCRATCH_DEV_NAME[1]}" $tmp.output && _fail "found stale device"
$BTRFS_UTIL_PROG device remove "${SCRATCH_DEV_NAME[1]}" "$TEST_DIR/$seq.mnt"
- $UMOUNT_PROG $TEST_DIR/$seq.mnt
+ _umount $TEST_DIR/$seq.mnt
_scratch_unmount
_spare_dev_put
_scratch_dev_pool_put
@@ -21,8 +21,8 @@ _cleanup()
rm -f $tmp.*
# The variables are set before the test case can fail.
- $UMOUNT_PROG ${loop_mnt1} &> /dev/null
- $UMOUNT_PROG ${loop_mnt2} &> /dev/null
+ _umount ${loop_mnt1} &> /dev/null
+ _umount ${loop_mnt2} &> /dev/null
rm -rf $loop_mnt1
rm -rf $loop_mnt2
@@ -66,7 +66,7 @@ loop_dev2=`_create_loop_device $fs_img2`
# Normal single device case, should pass just fine
_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \
_fail "Couldn't do initial mount"
-$UMOUNT_PROG $loop_mnt1
+_umount $loop_mnt1
_btrfs_forget_or_module_reload
@@ -75,15 +75,15 @@ _btrfs_forget_or_module_reload
# measure.
_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \
_fail "Failed to mount the second time"
-$UMOUNT_PROG $loop_mnt1
+_umount $loop_mnt1
_mount $loop_dev2 $loop_mnt2 > /dev/null 2>&1 || \
_fail "We couldn't mount the old generation"
-$UMOUNT_PROG $loop_mnt2
+_umount $loop_mnt2
_mount $loop_dev1 $loop_mnt1 > /dev/null 2>&1 || \
_fail "Failed to mount the second time"
-$UMOUNT_PROG $loop_mnt1
+_umount $loop_mnt1
# Now try mount them at the same time, if kernel does not support
# temp-fsid feature then mount will fail.
@@ -96,7 +96,7 @@ test_add_device()
$BTRFS_UTIL_PROG filesystem show -m $SCRATCH_MNT | \
_filter_btrfs_filesystem_show
- $UMOUNT_PROG $seq_mnt
+ _umount $seq_mnt
_scratch_unmount
cleanup_dmdev
}
@@ -63,7 +63,7 @@ ext4_online_resize()
fi
cat $tmp.resize2fs >> $seqres.full
echo "+++ umount fs" | tee -a $seqres.full
- $UMOUNT_PROG ${IMG_MNT}
+ _umount ${IMG_MNT}
echo "+++ check fs" | tee -a $seqres.full
_check_generic_filesystem $LOOP_DEVICE >> $seqres.full 2>&1 || \
@@ -77,7 +77,7 @@ _cleanup()
cd /
[ -n "$LOOP_DEVICE" ] && _destroy_loop_device $LOOP_DEVICE > /dev/null 2>&1
rm -f $tmp.*
- $UMOUNT_PROG ${IMG_MNT} > /dev/null 2>&1
+ _umount ${IMG_MNT} > /dev/null 2>&1
rm -f ${IMG_FILE} > /dev/null 2>&1
}
@@ -18,7 +18,7 @@ _cleanup()
cd /
rm -r -f $tmp.*
if [ ! -z "$loop_mnt" ]; then
- $UMOUNT_PROG $loop_mnt
+ _umount $loop_mnt
rm -rf $loop_mnt
fi
[ ! -z "$fs_img" ] && rm -rf $fs_img
@@ -63,7 +63,7 @@ then
status=1
fi
-$UMOUNT_PROG $loop_mnt || _fail "umount failed"
+_umount $loop_mnt || _fail "umount failed"
loop_mnt=
$E2FSCK_PROG -fn $fs_img >> $seqres.full 2>&1 || _fail "file system corrupted"
@@ -20,7 +20,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
_cleanup()
{
cd /
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
if [ -n "$LOOP_LOGDEV" ];then
_destroy_loop_device $LOOP_LOGDEV 2>/dev/null
fi
@@ -237,7 +237,7 @@ not_mnt() {
if simple_mount -o $1 $SCRATCH_DEV $SCRATCH_MNT; then
print_log "(mount unexpectedly succeeded)"
fail
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
return
fi
ok
@@ -248,7 +248,7 @@ not_mnt() {
return
fi
not_remount $1
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
mnt_only() {
@@ -270,7 +270,7 @@ mnt() {
fi
mnt_only $*
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
[ "$t2fs" -eq 0 ] && return
@@ -289,7 +289,7 @@ mnt() {
-e 's/data=writeback/journal_data_writeback/')
$TUNE2FS_PROG -o $op_set $SCRATCH_DEV > /dev/null 2>&1
mnt_only "defaults" $check
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
if [ "$op_set" = ^* ]; then
op_set=${op_set#^}
else
@@ -309,12 +309,12 @@ remount() {
do_mnt remount,$2 $3
if [ $? -ne 0 ]; then
fail
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
return
else
ok
fi
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
# Now just specify mnt
print_log "mounting $fstype \"$1\" "
@@ -328,7 +328,7 @@ remount() {
ok
fi
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
}
# Test that the filesystem cannot be remounted with option(s) $1 (meaning that
@@ -364,7 +364,7 @@ mnt_then_not_remount() {
return
fi
not_remount $2
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
@@ -400,8 +400,8 @@ LOGDEV_DEVNUM=`echo "${majmin%:*}*2^8 + ${majmin#*:}" | bc`
fstype=
for fstype in ext2 ext3 ext4; do
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
- $UMOUNT_PROG $SCRATCH_DEV 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_DEV 2> /dev/null
do_mkfs $SCRATCH_DEV ${SIZE}k
@@ -418,7 +418,7 @@ for fstype in ext2 ext3 ext4; do
continue
fi
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
not_mnt failme
mnt
@@ -552,7 +552,7 @@ for fstype in ext2 ext3 ext4; do
# dax mount options
simple_mount -o dax=always $SCRATCH_DEV $SCRATCH_MNT > /dev/null 2>&1
if [ $? -eq 0 ]; then
- $UMOUNT_PROG $SCRATCH_MNT 2> /dev/null
+ _umount $SCRATCH_MNT 2> /dev/null
mnt dax
mnt dax=always
mnt dax=never
@@ -633,7 +633,7 @@ for fstype in ext2 ext3 ext4; do
not_remount jqfmt=vfsv1
not_remount noquota
mnt_only remount,usrquota,grpquota ^usrquota,^grpquota
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
# test clearing/changing quota when enabled
do_mkfs -E quotatype=^prjquota $SCRATCH_DEV ${SIZE}k
@@ -654,7 +654,7 @@ for fstype in ext2 ext3 ext4; do
mnt_only remount,usrquota,grpquota usrquota,grpquota
quotaoff -f $SCRATCH_MNT >> $seqres.full 2>&1
mnt_only remount,noquota ^usrquota,^grpquota,quota
- $UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+ _umount $SCRATCH_MNT > /dev/null 2>&1
# Quota feature
echo "== Testing quota feature " >> $seqres.full
@@ -696,7 +696,7 @@ for fstype in ext2 ext3 ext4; do
done #for fstype in ext2 ext3 ext4; do
-$UMOUNT_PROG $SCRATCH_MNT > /dev/null 2>&1
+_umount $SCRATCH_MNT > /dev/null 2>&1
echo "$ERR errors encountered" >> $seqres.full
status=$ERR
@@ -70,7 +70,7 @@ do_resize()
# delay
sleep 0.2
_scratch_unmount >> $seqres.full 2>&1 \
- || _fail "$UMOUNT_PROG failed. Exiting"
+ || _fail "_umount failed. Exiting"
}
run_test()
@@ -44,7 +44,7 @@ _crashtest()
_filter_xfs_io
$here/src/godown -f $mnt
- $UMOUNT_PROG $mnt
+ _umount $mnt
_mount $img $mnt
# We should /never/ see 0xCD in the file, because we wrote that pattern
@@ -54,7 +54,7 @@ _crashtest()
_hexdump $file
fi
- $UMOUNT_PROG $mnt
+ _umount $mnt
}
# Modify as appropriate.
@@ -66,7 +66,7 @@ umount_symlink_device()
rm -f $symlink
echo "# umount symlink to device, which is not mounted" >>$seqres.full
ln -s $SCRATCH_DEV $symlink
- $UMOUNT_PROG $symlink >>$seqres.full 2>&1
+ _umount $symlink >>$seqres.full 2>&1
}
# umount a path name that is 256 bytes long, this should fail gracefully,
@@ -78,7 +78,7 @@ umount_toolong_name()
_scratch_mount 2>&1 | tee -a $seqres.full
echo "# umount a too-long name" >>$seqres.full
- $UMOUNT_PROG $longname >>$seqres.full 2>&1
+ _umount $longname >>$seqres.full 2>&1
_scratch_unmount 2>&1 | tee -a $seqres.full
}
@@ -93,7 +93,7 @@ lazy_umount_symlink()
rm -f $symlink
ln -s $SCRATCH_MNT/testdir $symlink
- $UMOUNT_PROG -l $symlink >>$seqres.full 2>&1
+ _umount -l $symlink >>$seqres.full 2>&1
# _scratch_unmount should not be blocked
_scratch_unmount 2>&1 | tee -a $seqres.full
}
@@ -32,7 +32,7 @@ _cleanup()
# other tests to fail.
while test -e /dev/mapper/$vgname-$snapname || \
test -e /dev/mapper/$vgname-$lvname; do
- $UMOUNT_PROG $mnt >> $seqres.full 2>&1
+ _umount $mnt >> $seqres.full 2>&1
$LVM_PROG lvremove -f $vgname/$snapname >>$seqres.full 2>&1
$LVM_PROG lvremove -f $vgname/$lvname >>$seqres.full 2>&1
$LVM_PROG vgremove -f $vgname >>$seqres.full 2>&1
@@ -27,7 +27,7 @@ cleanup_dmdev()
$DMSETUP_PROG resume $lvdev >/dev/null 2>&1
[ -n "$pid" ] && kill -9 $pid 2>/dev/null
wait $pid
- $UMOUNT_PROG $lvdev >/dev/null 2>&1
+ _umount $lvdev >/dev/null 2>&1
_dmsetup_remove $node
}
@@ -70,7 +70,7 @@ done &
pid=$!
for ((i=0; i<100; i++)); do
_mount $lvdev $SCRATCH_MNT >/dev/null 2>&1
- $UMOUNT_PROG $lvdev >/dev/null 2>&1
+ _umount $lvdev >/dev/null 2>&1
done &
pid="$pid $!"
@@ -18,7 +18,7 @@ _cleanup()
{
cd /
echo running > /sys/block/`_short_dev $SCSI_DEBUG_DEV`/device/state
- $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
+ _umount $SCRATCH_MNT >>$seqres.full 2>&1
$LVM_PROG vgremove -f $vgname >>$seqres.full 2>&1
$LVM_PROG pvremove -f $SCRATCH_DEV $SCSI_DEBUG_DEV >>$seqres.full 2>&1
$UDEV_SETTLE_PROG
@@ -16,7 +16,7 @@ _begin_fstest auto quick
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $fs_mnt
+ _umount $fs_mnt
_destroy_loop_device $loop_dev
cd /
rm -f $tmp.*
@@ -60,7 +60,7 @@ md5sum $testdir/file | _filter_scratch
md5sum $othertestdir/otherfile | filter_otherdir
echo "Unmount otherdir"
-$UMOUNT_PROG $otherdir
+_umount $otherdir
rm -rf $otherdir
# success, all done
@@ -59,7 +59,7 @@ echo "Check output"
md5sum $testdir/file $othertestdir/otherfile | filter_md5
echo "Unmount otherdir"
-$UMOUNT_PROG $otherdir
+_umount $otherdir
rm -rf $otherdir
# success, all done
@@ -28,7 +28,7 @@ _cleanup()
xfs_freeze -u $SCRATCH_MNT 2>/dev/null
cd /
rm -f $tmp.*
- $UMOUNT_PROG $SCRATCH_MNT >>$seqres.full 2>&1
+ _umount $SCRATCH_MNT >>$seqres.full 2>&1
$LVM_PROG vgremove -ff $vgname >>$seqres.full 2>&1
$LVM_PROG pvremove -ff $SCRATCH_DEV >>$seqres.full 2>&1
$UDEV_SETTLE_PROG
@@ -26,6 +26,8 @@ done
# mount the base fs. Delay the mount attempt by a small amount in the hope
# that the mount() call will try to lock s_umount /after/ umount has already
# taken it.
+# This is the /one/ place in fstests where we need to call the umount binary
+# directly.
$UMOUNT_PROG $SCRATCH_MNT &
sleep 0.01s ; _scratch_mount
wait
@@ -20,7 +20,7 @@ _cleanup()
$KILLALL_PROG -9 fsstress > /dev/null 2>&1
wait
if [ -n "$loopmnt" ]; then
- $UMOUNT_PROG $loopmnt 2>/dev/null
+ _umount $loopmnt 2>/dev/null
rm -r -f $loopmnt
fi
rm -f $tmp.*
@@ -111,7 +111,7 @@ while _soak_loop_running $((25 * TIME_FACTOR)); do
# Mount again to replay log after loading working table, so we have a
# consistent fs after test.
- $UMOUNT_PROG $loopmnt
+ _umount $loopmnt
is_unmounted=1
# We must unmount dmerror at here, or whole later testing will crash.
# So try to umount enough times, before we have no choice.
@@ -137,7 +137,7 @@ done
# Make sure the fs image file is ok
if [ -f "$loopimg" ]; then
if _mount $loopimg $loopmnt -o loop; then
- $UMOUNT_PROG $loopmnt &> /dev/null
+ _umount $loopmnt &> /dev/null
else
_metadump_dev $DMERROR_DEV $seqres.scratch.final.md
echo "final scratch mount failed"
@@ -17,8 +17,8 @@ _begin_fstest auto quick perms attr idmapped mount
_cleanup()
{
cd /
- $UMOUNT_PROG $SCRATCH_MNT/target-mnt 2>/dev/null
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT/target-mnt 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
rm -r -f $tmp.*
}
@@ -15,9 +15,9 @@ _begin_fstest auto quick perms attr idmapped mount
_cleanup()
{
cd /
- $UMOUNT_PROG $SCRATCH_MNT/target-mnt
- $UMOUNT_PROG $SCRATCH_MNT/ovl-merge 2>/dev/null
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT/target-mnt
+ _umount $SCRATCH_MNT/ovl-merge 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
rm -r -f $tmp.*
}
@@ -113,7 +113,7 @@ setup_overlayfs_idmapped_lower_metacopy_on()
reset_overlayfs()
{
- $UMOUNT_PROG $SCRATCH_MNT/ovl-merge 2>/dev/null
+ _umount $SCRATCH_MNT/ovl-merge 2>/dev/null
rm -rf $upper $work $merge
}
@@ -14,7 +14,7 @@ _cleanup()
{
cd /
rm -r -f $tmp.*
- [ -d "$SCSI_DEBUG_MNT" ] && $UMOUNT_PROG $SCSI_DEBUG_MNT 2>/dev/null
+ [ -d "$SCSI_DEBUG_MNT" ] && _umount $SCSI_DEBUG_MNT 2>/dev/null
_put_scsi_debug_dev
}
@@ -12,7 +12,7 @@ _begin_fstest auto quick
_cleanup()
{
cd /
- $UMOUNT_PROG $SCSI_DEBUG_MNT >>$seqres.full 2>&1
+ _umount $SCSI_DEBUG_MNT >>$seqres.full 2>&1
_put_scsi_debug_dev
rm -f $tmp.*
}
@@ -13,7 +13,7 @@ _begin_fstest auto quick
_cleanup()
{
cd /
- $UMOUNT_PROG $SCSI_DEBUG_MNT >>$seqres.full 2>&1
+ _umount $SCSI_DEBUG_MNT >>$seqres.full 2>&1
_put_scsi_debug_dev
rm -f $tmp.*
}
@@ -15,8 +15,8 @@ _begin_fstest auto quick rename
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $testdir1 2>/dev/null
- $UMOUNT_PROG $testdir2 2>/dev/null
+ _umount $testdir1 2>/dev/null
+ _umount $testdir2 2>/dev/null
cd /
rm -r -f $tmp.*
}
@@ -38,7 +38,7 @@ esac
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $loop_dev &> /dev/null
+ _umount $loop_dev &> /dev/null
_destroy_loop_device $loop_dev
if [ $status -eq 0 ]; then
rm -rf $tmp
@@ -53,7 +53,7 @@ get_holes()
# in-core state that will perturb the free space map on umount. Stick
# to established convention which requires the filesystem to be
# unmounted while we probe the underlying file.
- $UMOUNT_PROG $loop_mnt
+ _umount $loop_mnt
# FIEMAP only works on regular files, so call it on the backing file
# and not the loop device like everything else
@@ -66,7 +66,7 @@ get_free_sectors()
{
case $FSTYP in
ext4)
- $UMOUNT_PROG $loop_mnt
+ _umount $loop_mnt
$DUMPE2FS_PROG $loop_dev 2>&1 | grep " Free blocks" | cut -d ":" -f2- | \
tr ',' '\n' | $SED_PROG 's/^ //' | \
$AWK_PROG -v spb=$sectors_per_block 'BEGIN{FS="-"};
@@ -80,7 +80,7 @@ get_free_sectors()
xfs)
agsize=`$XFS_INFO_PROG $loop_mnt | $SED_PROG -n 's/.*agsize=\(.*\) blks.*/\1/p'`
# Convert free space (agno, block, length) to (start sector, end sector)
- $UMOUNT_PROG $loop_mnt
+ _umount $loop_mnt
$XFS_DB_PROG -r -c "freesp -d" $loop_dev | $SED_PROG '/^.*from/,$d'| \
$AWK_PROG -v spb=$sectors_per_block -v agsize=$agsize \
'{ print spb * ($1 * agsize + $2), spb * ($1 * agsize + $2 + $3) - 1 }'
@@ -56,7 +56,7 @@ rm -rf ${SCRATCH_MNT}/*
ls ${SCRATCH_MNT}/
# unmount overlayfs but not base fs
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
echo "Silence is golden"
# success, all done
@@ -53,7 +53,7 @@ _user_do "chmod u-X ${SCRATCH_MNT}/attr_file2 > /dev/null 2>&1"
stat -c %a ${SCRATCH_MNT}/attr_file2
# unmount overlayfs but not base fs
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# check mode bits of the file that has been copied up, and
# the file that should not have been copied up.
@@ -75,14 +75,14 @@ $XFS_IO_PROG -f -c "o" ${SCRATCH_MNT}/test_file \
>>$seqres.full 2>&1
# unmount overlayfs
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# check overlayfs
_overlay_check_scratch_dirs $lowerd $upperd $workd
# unmount undelying xfs, this tiggers panic if memleak happens
-$UMOUNT_PROG ${OVL_BASE_SCRATCH_MNT}/uppermnt
-$UMOUNT_PROG ${OVL_BASE_SCRATCH_MNT}/lowermnt
+_umount ${OVL_BASE_SCRATCH_MNT}/uppermnt
+_umount ${OVL_BASE_SCRATCH_MNT}/lowermnt
# success, all done
echo "Silence is golden"
@@ -46,7 +46,7 @@ _overlay_scratch_mount_dirs $lowerdir1 $lowerdir2 $workdir2
rm -rf $SCRATCH_MNT/testdir
mkdir -p $SCRATCH_MNT/testdir/visibledir
# unmount overlayfs but not base fs
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# check overlayfs
_overlay_check_scratch_dirs $lowerdir1 $lowerdir2 $workdir2
@@ -59,7 +59,7 @@ touch $SCRATCH_MNT/testdir/visiblefile
# umount and mount overlay again, buggy kernel treats the copied-up dir as
# opaque, visibledir is not seen in merged dir.
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
_overlay_scratch_mount_dirs "$lowerdir2:$lowerdir1" $upperdir $workdir
ls $SCRATCH_MNT/testdir
@@ -17,7 +17,7 @@ _begin_fstest auto quick mount nested
_cleanup()
{
cd /
- $UMOUNT_PROG $tmp/mnt > /dev/null 2>&1
+ _umount $tmp/mnt > /dev/null 2>&1
rm -rf $tmp
rm -f $tmp.*
}
@@ -19,8 +19,8 @@ _begin_fstest auto quick attr
_cleanup()
{
cd /
- $UMOUNT_PROG $tmpfsdir/mnt
- $UMOUNT_PROG $tmpfsdir
+ _umount $tmpfsdir/mnt
+ _umount $tmpfsdir
rm -rf $tmpfsdir
rm -f $tmp.*
}
@@ -22,7 +22,7 @@ _begin_fstest auto quick nested
_cleanup()
{
cd /
- $UMOUNT_PROG $tmp/mnt
+ _umount $tmp/mnt
rm -rf $tmp
rm -f $tmp.*
}
@@ -56,7 +56,7 @@ _overlay_mount_dirs $SCRATCH_MNT/up $tmp/{upper,work} \
overlay $tmp/mnt
# accessing file in the second mount
cat $tmp/mnt/foo
-$UMOUNT_PROG $tmp/mnt
+_umount $tmp/mnt
# re-create upper/work to avoid ovl_verify_origin() mount failure
# when index is enabled
@@ -66,7 +66,7 @@ mkdir -p $tmp/{upper,work}
_overlay_mount_dirs $SCRATCH_MNT/low $tmp/{upper,work} \
overlay $tmp/mnt
cat $tmp/mnt/bar
-$UMOUNT_PROG $tmp/mnt
+_umount $tmp/mnt
rm -rf $tmp/{upper,work}
mkdir -p $tmp/{upper,work}
@@ -28,7 +28,7 @@ create_whiteout()
rm -f $SCRATCH_MNT/testdir/$file
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Import common functions.
@@ -68,7 +68,7 @@ rm -rf $SCRATCH_MNT/testdir 2>&1 | _filter_scratch
# umount overlay again, create a new file with the same name and
# mount overlay again.
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
touch $lowerdir1/testdir
_overlay_scratch_mount_dirs $lowerdir1 $upperdir $workdir
@@ -77,7 +77,7 @@ _overlay_scratch_mount_dirs $lowerdir1 $upperdir $workdir
# it will not clean up the dir and lead to residue.
rm -rf $SCRATCH_MNT/testdir 2>&1 | _filter_scratch
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# let lower dir have invalid whiteouts, repeat ls and rmdir test again.
rm -rf $lowerdir1/testdir
@@ -92,7 +92,7 @@ _overlay_scratch_mount_dirs "$lowerdir1:$lowerdir2" $upperdir $workdir
ls $SCRATCH_MNT/testdir
rm -rf $SCRATCH_MNT/testdir 2>&1 | _filter_scratch
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# let lower dir and upper dir both have invalid whiteouts, repeat ls and rmdir again.
rm -rf $lowerdir1/testdir
@@ -43,7 +43,7 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
_overlay_scratch_mount_opts -o"lowerdir=$lowerdir2:$lowerdir1"
touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
_mount -o remount,rw $SCRATCH_MNT 2>&1 | _filter_ro_mount
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Make workdir immutable to prevent workdir re-create on mount
$CHATTR_PROG +i $workdir
@@ -34,8 +34,8 @@ _cleanup()
cd /
rm -f $tmp.*
# unmount the two extra mounts in case they did not fail
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
}
# Import common functions.
@@ -66,13 +66,13 @@ _overlay_mount_dirs $lowerdir $upperdir $workdir \
# with index=off - expect success
_overlay_mount_dirs $lowerdir $upperdir $workdir2 \
overlay0 $SCRATCH_MNT -oindex=off && \
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
# Try to mount another overlay with the same workdir
# with index=off - expect success
_overlay_mount_dirs $lowerdir2 $upperdir2 $workdir \
overlay1 $SCRATCH_MNT -oindex=off && \
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
# Try to mount another overlay with the same upperdir
# with index=on - expect EBUSY
@@ -39,17 +39,17 @@ mkdir -p $lowerdir $lowerdir2 $upperdir $upperdir2 $workdir
# Mount overlay with lowerdir, upperdir, workdir and index=on
# to store the file handles of lowerdir and upperdir in overlay.origin xattr
_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -oindex=on
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Try to mount an overlay with the same upperdir and different lowerdir - expect ESTALE
_overlay_scratch_mount_dirs $lowerdir2 $upperdir $workdir -oindex=on \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
# Try to mount an overlay with the same workdir and different upperdir - expect ESTALE
_overlay_scratch_mount_dirs $lowerdir $upperdir2 $workdir -oindex=on \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
# Mount overlay with original lowerdir, upperdir, workdir and index=on - expect success
_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -oindex=on
@@ -48,7 +48,7 @@ _scratch_mount
# modify lower origin file.
$CHATTR_PROG +i $SCRATCH_MNT/foo > /dev/null 2>&1
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# touching origin file in lower, should succeed
touch $lowerdir/foo
@@ -142,7 +142,7 @@ subdir_d=$($here/src/t_dir_type $pure_lower_dir $pure_lower_subdir_st_ino)
[[ $subdir_d == "subdir d" ]] || \
echo "Merged dir: Invalid d_ino reported for subdir"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# check overlayfs
_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o xino=on
@@ -45,7 +45,7 @@ _scratch_mount -o index=off
# Copy up lower and create upper hardlink with no index
ln $SCRATCH_MNT/0 $SCRATCH_MNT/1
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Add lower hardlinks while overlay is offline
ln $lowerdir/0 $lowerdir/2
@@ -126,7 +126,7 @@ echo 3 > /proc/sys/vm/drop_caches
check_inode_numbers $testdir $tmp.after_copyup $tmp.after_move
# Verify that the inode numbers survive a mount cycle
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o redirect_dir=on,xino=on
# Compare inode numbers before/after mount cycle
@@ -99,7 +99,7 @@ cat $FILES
check_ino_nlink $SCRATCH_MNT $tmp.before $tmp.after_one
# Verify that the hardlinks survive a mount cycle
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
_overlay_check_scratch_dirs $lowerdir $upperdir $workdir -o index=on,xino=on
_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir -o index=on,xino=on
@@ -32,7 +32,7 @@ report_nlink()
_ls_l $SCRATCH_MNT/$f | awk '{ print $2, $9 }' | _filter_scratch
done
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Create lower hardlinks
@@ -101,7 +101,7 @@ touch $SCRATCH_MNT/1
touch $SCRATCH_MNT/2
# Perform the rest of the changes offline
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
test_hardlinks_offline
@@ -32,7 +32,7 @@ create_redirect()
touch $SCRATCH_MNT/origin/file
mv $SCRATCH_MNT/origin $SCRATCH_MNT/$redirect
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Import common functions.
@@ -76,7 +76,7 @@ mount_dirs()
# Unmount the overlay without unmounting base fs
unmount_dirs()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Check non-stale file handles of lower/upper files and verify
@@ -28,7 +28,7 @@ _cleanup()
# Cleanup overlay scratch mount that is holding base test mount
# to prevent _check_test_fs and _test_umount from failing before
# _check_scratch_fs _scratch_umount
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
}
# Import common functions.
@@ -103,7 +103,7 @@ mount_dirs()
# underlying dirs
unmount_dirs()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_check_scratch_dirs $middle:$lower $upper $work \
-o "index=on,nfs_export=on"
@@ -73,7 +73,7 @@ mount_dirs()
# Unmount the overlay without unmounting base fs
unmount_dirs()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Check non-stale file handles of lower/upper moved files
@@ -30,7 +30,7 @@ _cleanup()
# Cleanup overlay scratch mount that is holding base test mount
# to prevent _check_test_fs and _test_umount from failing before
# _check_scratch_fs _scratch_umount
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
}
# Import common functions.
@@ -99,7 +99,7 @@ mount_dirs()
# underlying dirs
unmount_dirs()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_check_scratch_dirs $middle:$lower $upper $work \
-o "index=on,nfs_export=on,redirect_dir=on"
@@ -87,7 +87,7 @@ mount_dirs()
# Unmount the overlay without unmounting base fs
unmount_dirs()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Check encode/decode/read file handles of dir with non-indexed ancestor
@@ -37,7 +37,7 @@ _cleanup()
# Cleanup overlay scratch mount that is holding base test mount
# to prevent _check_test_fs and _test_umount from failing before
# _check_scratch_fs _scratch_umount
- $UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+ _umount $SCRATCH_MNT 2>/dev/null
}
# Import common functions.
@@ -109,7 +109,7 @@ mount_dirs()
# underlying dirs
unmount_dirs()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_check_scratch_dirs $middle:$lower $upper $work \
-o "index=on,nfs_export=on,redirect_dir=on"
@@ -73,7 +73,7 @@ mkdir $lowerdir/testdir2/subdir
_overlay_scratch_mount_dirs $lowerdir $upperdir $workdir
touch $SCRATCH_MNT/testdir1/foo
touch $SCRATCH_MNT/testdir2/subdir
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
remove_impure $upperdir/testdir1
remove_impure $upperdir/testdir2
@@ -48,7 +48,7 @@ _overlay_scratch_mount_dirs $lowerdir $lowerdir2 $workdir2 -o redirect_dir=on
# Create opaque parent with absolute redirect child in middle layer
mkdir $SCRATCH_MNT/pure
mv $SCRATCH_MNT/origin $SCRATCH_MNT/pure/redirect
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
_overlay_scratch_mount_dirs $lowerdir2:$lowerdir $upperdir $workdir -o redirect_dir=on
mv $SCRATCH_MNT/pure/redirect $SCRATCH_MNT/redirect
# List content of renamed merge dir before mount cycle
@@ -56,7 +56,7 @@ ls $SCRATCH_MNT/redirect/
# Verify that redirects are followed by listing content of renamed merge dir
# after mount cycle
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
_overlay_scratch_mount_dirs $lowerdir2:$lowerdir $upperdir $workdir -o redirect_dir=on
ls $SCRATCH_MNT/redirect/
@@ -33,7 +33,7 @@ create_origin_ref()
_scratch_mount -o redirect_dir=on
mv $SCRATCH_MNT/origin $SCRATCH_MNT/$ref
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Import common functions.
@@ -130,7 +130,7 @@ mount_ro_overlay()
umount_overlay()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
# Assumes it is called with overlay mounted.
@@ -18,7 +18,7 @@ _cleanup()
{
cd /
rm -f $tmp.*
- $UMOUNT_PROG $lowertestdir
+ _umount $lowertestdir
}
# Import common functions.
@@ -40,7 +40,7 @@ rm ${upperdir}/file
mkdir ${SCRATCH_MNT}/file > /dev/null 2>&1
# unmount overlayfs
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
echo "Silence is golden"
# success, all done
@@ -30,7 +30,7 @@ _cleanup()
{
cd /
rm -f $tmp.*
- $UMOUNT_PROG $mnt2 2>/dev/null
+ _umount $mnt2 2>/dev/null
}
# Import common functions.
@@ -63,7 +63,7 @@ mkdir -p $lowerdir/lower $upperdir $workdir
echo Conflicting upperdir/lowerdir
_overlay_scratch_mount_dirs $upperdir $upperdir $workdir \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
# Use new upper/work dirs for each test to avoid ESTALE errors
# on mismatch lowerdir/upperdir (see test overlay/037)
@@ -75,7 +75,7 @@ mkdir $upperdir $workdir
echo Conflicting workdir/lowerdir
_overlay_scratch_mount_dirs $workdir $upperdir $workdir \
-oindex=off 2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir $workdir
mkdir -p $upperdir/lower $workdir
@@ -85,7 +85,7 @@ mkdir -p $upperdir/lower $workdir
echo Overlapping upperdir/lowerdir
_overlay_scratch_mount_dirs $upperdir/lower $upperdir $workdir \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir $workdir
mkdir $upperdir $workdir
@@ -94,7 +94,7 @@ mkdir $upperdir $workdir
echo Conflicting lower layers
_overlay_scratch_mount_dirs $lowerdir:$lowerdir $upperdir $workdir \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir $workdir
mkdir $upperdir $workdir
@@ -103,7 +103,7 @@ mkdir $upperdir $workdir
echo Overlapping lower layers below
_overlay_scratch_mount_dirs $lowerdir:$lowerdir/lower $upperdir $workdir \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir $workdir
mkdir $upperdir $workdir
@@ -112,7 +112,7 @@ mkdir $upperdir $workdir
echo Overlapping lower layers above
_overlay_scratch_mount_dirs $lowerdir/lower:$lowerdir $upperdir $workdir \
2>&1 | _filter_error_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir $workdir
mkdir -p $upperdir/upper $workdir $mnt2
@@ -129,14 +129,14 @@ mkdir -p $upperdir2 $workdir2 $mnt2
echo "Overlapping with upperdir of another instance (index=on)"
_overlay_scratch_mount_dirs $upperdir/upper $upperdir2 $workdir2 \
-oindex=on 2>&1 | _filter_busy_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir2 $workdir2
mkdir -p $upperdir2 $workdir2
echo "Overlapping with upperdir of another instance (index=off)"
_overlay_scratch_mount_dirs $upperdir/upper $upperdir2 $workdir2 \
- -oindex=off && $UMOUNT_PROG $SCRATCH_MNT
+ -oindex=off && _umount $SCRATCH_MNT
rm -rf $upperdir2 $workdir2
mkdir -p $upperdir2 $workdir2
@@ -146,14 +146,14 @@ mkdir -p $upperdir2 $workdir2
echo "Overlapping with workdir of another instance (index=on)"
_overlay_scratch_mount_dirs $workdir/work $upperdir2 $workdir2 \
-oindex=on 2>&1 | _filter_busy_mount
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
rm -rf $upperdir2 $workdir2
mkdir -p $upperdir2 $workdir2
echo "Overlapping with workdir of another instance (index=off)"
_overlay_scratch_mount_dirs $workdir/work $upperdir2 $workdir2 \
- -oindex=off && $UMOUNT_PROG $SCRATCH_MNT
+ -oindex=off && _umount $SCRATCH_MNT
# Move upper layer root into lower layer after mount
echo Overlapping upperdir/lowerdir after mount
@@ -70,7 +70,7 @@ stat $testfile >>$seqres.full
diff -q $realfile $testfile >>$seqres.full &&
echo "diff with middle layer file doesn't know right from wrong! (cold cache)"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# check overlayfs
_overlay_check_scratch_dirs $middle:$lower $upper $work -o xino=off
@@ -28,7 +28,7 @@ _cleanup()
cd /
rm -f $tmp.*
# Unmount the nested overlay mount
- $UMOUNT_PROG $mnt2 2>/dev/null
+ _umount $mnt2 2>/dev/null
}
# Import common functions.
@@ -100,7 +100,7 @@ mount_dirs()
unmount_dirs()
{
# unmount & check nested overlay
- $UMOUNT_PROG $mnt2
+ _umount $mnt2
_overlay_check_dirs $SCRATCH_MNT $upper2 $work2 \
-o "index=on,nfs_export=on,redirect_dir=on"
@@ -28,7 +28,7 @@ _cleanup()
cd /
rm -f $tmp.*
# Unmount the nested overlay mount
- $UMOUNT_PROG $mnt2 2>/dev/null
+ _umount $mnt2 2>/dev/null
}
# Import common functions.
@@ -108,12 +108,12 @@ mount_dirs()
unmount_dirs()
{
# unmount & check nested overlay
- $UMOUNT_PROG $mnt2
+ _umount $mnt2
_overlay_check_dirs $SCRATCH_MNT $upper2 $work2 \
-o "index=on,nfs_export=on,redirect_dir=on"
# unmount & check underlying overlay
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_check_dirs $lower $upper $work \
-o "index=on,nfs_export=on,redirect_dir=on"
}
@@ -26,7 +26,7 @@ _cleanup()
cd /
rm -f $tmp.*
# Unmount the nested overlay mount
- $UMOUNT_PROG $mnt2 2>/dev/null
+ _umount $mnt2 2>/dev/null
[ -z "$loopdev" ] || _destroy_loop_device $loopdev
}
@@ -93,12 +93,12 @@ mount_dirs()
unmount_dirs()
{
# unmount & check nested overlay
- $UMOUNT_PROG $mnt2
+ _umount $mnt2
_overlay_check_dirs $SCRATCH_MNT $upper2 $work2 \
-o "redirect_dir=on,index=on,xino=on"
# unmount & check underlying overlay
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_check_scratch_dirs $lower $upper $work \
-o "index=on,nfs_export=on"
}
@@ -29,7 +29,7 @@ _cleanup()
cd /
rm -f $tmp.*
# Unmount the nested overlay mount
- $UMOUNT_PROG $mnt2 2>/dev/null
+ _umount $mnt2 2>/dev/null
[ -z "$loopdev" ] || _destroy_loop_device $loopdev
}
@@ -103,12 +103,12 @@ mount_dirs()
unmount_dirs()
{
# unmount & check nested overlay
- $UMOUNT_PROG $mnt2
+ _umount $mnt2
_overlay_check_dirs $SCRATCH_MNT $upper2 $work2 \
-o "redirect_dir=on,index=on,xino=on"
# unmount & check underlying overlay
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
_overlay_check_dirs $lower $upper $work \
-o "index=on,nfs_export=on"
}
@@ -47,7 +47,7 @@ _scratch_mount
# on kernel v5.10..v5.10.14. Anything but hang is considered a test success.
$CHATTR_PROG +i $SCRATCH_MNT/foo > /dev/null 2>&1
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# success, all done
echo "Silence is golden"
@@ -65,7 +65,7 @@ mv $SCRATCH_MNT/f100 $SCRATCH_MNT/former/
# Remove the lower directory and mount overlay again to create
# a "former merge dir"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
rm -rf $lowerdir/former
_scratch_mount
@@ -61,7 +61,7 @@ do_check()
echo "Test chattr +$1 $2" >> $seqres.full
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
# Add attribute to lower file
$CHATTR_PROG +$attr $lowertestfile
@@ -156,7 +156,7 @@ mount_ro_overlay()
umount_overlay()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
test_no_access()
@@ -264,7 +264,7 @@ mount_overlay()
umount_overlay()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
@@ -46,7 +46,7 @@ ovl_fsid=$(stat -f -c '%i' $test_dir)
echo "Overlayfs (uuid=null) and upper fs fsid differ"
# Keep base fs mounted in case it has a volatile fsid (e.g. tmpfs)
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Test legacy behavior is preserved by default for existing "impure" overlayfs
_scratch_mount
@@ -55,7 +55,7 @@ ovl_fsid=$(stat -f -c '%i' $test_dir)
[[ "$ovl_fsid" == "$upper_fsid" ]] || \
echo "Overlayfs (after uuid=null) and upper fs fsid differ"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Test unique fsid on explicit opt-in for existing "impure" overlayfs
_scratch_mount -o uuid=on
@@ -65,7 +65,7 @@ ovl_unique_fsid=$ovl_fsid
[[ "$ovl_fsid" != "$upper_fsid" ]] || \
echo "Overlayfs (uuid=on) and upper fs fsid are the same"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Test unique fsid is persistent by default after it was created
_scratch_mount
@@ -74,7 +74,7 @@ ovl_fsid=$(stat -f -c '%i' $test_dir)
[[ "$ovl_fsid" == "$ovl_unique_fsid" ]] || \
echo "Overlayfs (after uuid=on) unique fsid is not persistent"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Test ignore existing persistent fsid on explicit opt-out
_scratch_mount -o uuid=null
@@ -83,7 +83,7 @@ ovl_fsid=$(stat -f -c '%i' $test_dir)
[[ "$ovl_fsid" == "$upper_fsid" ]] || \
echo "Overlayfs (uuid=null) and upper fs fsid differ"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Test fallback to uuid=null with non-upper ovelray
_overlay_scratch_mount_dirs "$upperdir:$lowerdir" "-" "-" -o ro,uuid=on
@@ -110,7 +110,7 @@ ovl_unique_fsid=$ovl_fsid
[[ "$ovl_fsid" != "$upper_fsid" ]] || \
echo "Overlayfs (new) and upper fs fsid are the same"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
# Test unique fsid is persistent by default after it was created
_scratch_mount -o uuid=on
@@ -119,7 +119,7 @@ ovl_fsid=$(stat -f -c '%i' $test_dir)
[[ "$ovl_fsid" == "$ovl_unique_fsid" ]] || \
echo "Overlayfs (uuid=on) unique fsid is not persistent"
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
echo "Silence is golden"
status=0
@@ -52,7 +52,7 @@ _mount -t overlay | grep ovl_esc_test | tee -a $seqres.full | grep -v spaces &&
# Re-create the upper/work dirs to mount them with a different lower
# This is required in case index feature is enabled
-$UMOUNT_PROG $SCRATCH_MNT
+_umount $SCRATCH_MNT
rm -rf "$upperdir" "$workdir"
mkdir -p "$upperdir" "$workdir"
@@ -15,7 +15,7 @@ _cleanup()
{
cd /
# Unmount nested mounts if things fail
- $UMOUNT_PROG $OVL_BASE_SCRATCH_MNT/nested 2>/dev/null
+ _umount $OVL_BASE_SCRATCH_MNT/nested 2>/dev/null
rm -rf $tmp
}
@@ -44,7 +44,7 @@ nesteddir=$OVL_BASE_SCRATCH_MNT/nested
umount_overlay()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
test_escape()
@@ -88,12 +88,12 @@ test_escape()
echo "nested xattr mount with trusted.overlay"
_overlay_mount_dirs $SCRATCH_MNT/layer2:$SCRATCH_MNT/layer1 - - overlayfs $nesteddir
stat $nesteddir/dir/file 2>&1 | _filter_scratch
- $UMOUNT_PROG $nesteddir
+ _umount $nesteddir
echo "nested xattr mount with user.overlay"
_overlay_mount_dirs $SCRATCH_MNT/layer2:$SCRATCH_MNT/layer1 - - -o userxattr overlayfs $nesteddir
stat $nesteddir/dir/file 2>&1 | _filter_scratch
- $UMOUNT_PROG $nesteddir
+ _umount $nesteddir
# Also ensure propagate the escaped xattr when we copy-up layer2/dir
echo "copy-up of escaped xattrs"
@@ -164,7 +164,7 @@ test_escaped_xwhiteout()
do_test_xwhiteout $prefix $nesteddir
- $UMOUNT_PROG $nesteddir
+ _umount $nesteddir
}
test_escaped_xwhiteout trusted
@@ -157,7 +157,7 @@ mount_ro_overlay()
umount_overlay()
{
- $UMOUNT_PROG $SCRATCH_MNT
+ _umount $SCRATCH_MNT
}
test_no_access()
@@ -38,21 +38,21 @@ _mount -t overlay none $SCRATCH_MNT \
2>> $seqres.full && \
echo "ERROR: invalid combination of lowerdir and lowerdir+ mount options"
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
_mount -t overlay none $SCRATCH_MNT \
-o"lowerdir=$lowerdir,datadir+=$lowerdir_colons" \
-o redirect_dir=follow,metacopy=on 2>> $seqres.full && \
echo "ERROR: invalid combination of lowerdir and datadir+ mount options"
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
_mount -t overlay none $SCRATCH_MNT \
-o"datadir+=$lowerdir,lowerdir+=$lowerdir_colons" \
-o redirect_dir=follow,metacopy=on 2>> $seqres.full && \
echo "ERROR: invalid order of lowerdir+ and datadir+ mount options"
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
# mount is expected to fail with escaped colons.
_mount -t overlay none $SCRATCH_MNT \
@@ -60,7 +60,7 @@ _mount -t overlay none $SCRATCH_MNT \
2>> $seqres.full && \
echo "ERROR: incorrect parsing of escaped colons in lowerdir+ mount option"
-$UMOUNT_PROG $SCRATCH_MNT 2>/dev/null
+_umount $SCRATCH_MNT 2>/dev/null
# mount is expected to succeed without escaped colons.
_mount -t overlay ovl_esc_test $SCRATCH_MNT \
@@ -16,7 +16,7 @@ _cleanup()
{
cd /
rm -f $tmp.*
- $UMOUNT_PROG $LOOP_MNT 2>/dev/null
+ _umount $LOOP_MNT 2>/dev/null
[ -n "$LOOP_DEV" ] && _destroy_loop_device $LOOP_DEV 2>/dev/null
# try to keep the image file if test fails
[ $status -eq 0 ] && rm -f $LOOP_IMG
@@ -81,7 +81,7 @@ _grow_loop()
$XFS_GROWFS_PROG $LOOP_MNT 2>&1 | _filter_growfs 2>&1
echo "*** unmount"
- $UMOUNT_PROG -d $LOOP_MNT && LOOP_DEV=
+ _umount -d $LOOP_MNT && LOOP_DEV=
# Large grows takes forever to check..
if [ "$check" -gt "0" ]
@@ -14,7 +14,7 @@ _begin_fstest auto quick fuzzers
_cleanup()
{
cd /
- $UMOUNT_PROG $mntpt > /dev/null 2>&1
+ _umount $mntpt > /dev/null 2>&1
_destroy_loop_device $loopdev > /dev/null 2>&1
rm -r -f $tmp.*
}
@@ -90,7 +90,7 @@ cat $tmp.log >> $seqres.full
cat $tmp.log | _filter_test_dir
# Corrupt the entries
-$UMOUNT_PROG $mntpt
+_umount $mntpt
_destroy_loop_device $loopdev
cp $imgfile $imgfile.old
sed -b \
@@ -121,7 +121,7 @@ fi
echo "does repair complain?" >> $seqres.full
# Does repair complain about this?
-$UMOUNT_PROG $mntpt
+_umount $mntpt
$XFS_REPAIR_PROG -n $loopdev >> $seqres.full 2>&1
res=$?
test $res -eq 1 || \
@@ -22,7 +22,7 @@ loop_symlink=$TEST_DIR/loop_symlink.$$
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $mntdir
+ _umount $mntdir
[ -n "$loop_dev" ] && _destroy_loop_device $loop_dev
rmdir $mntdir
rm -f $loop_symlink
@@ -73,7 +73,7 @@ echo "=== xfs_growfs - check device symlink ==="
$XFS_GROWFS_PROG -D 12288 $loop_symlink > /dev/null
echo "=== unmount ==="
-$UMOUNT_PROG $mntdir || _fail "!!! failed to unmount"
+_umount $mntdir || _fail "!!! failed to unmount"
echo "=== mount device symlink ==="
_mount $loop_symlink $mntdir || _fail "!!! failed to loopback mount"
@@ -87,7 +87,7 @@ _do_eas()
_create_eas $2 $3
fi
echo ""
- cd /; $UMOUNT_PROG $SCRATCH_MNT
+ cd /; _umount $SCRATCH_MNT
_print_inode
}
@@ -99,7 +99,7 @@ _do_dirents()
echo ""
_scratch_mount
_create_dirents $1 $2
- cd /; $UMOUNT_PROG $SCRATCH_MNT
+ cd /; _umount $SCRATCH_MNT
_print_inode
}
@@ -13,8 +13,8 @@ _begin_fstest growfs auto quick
# Override the default cleanup function.
_cleanup()
{
- $UMOUNT_PROG $tmpdir
- $UMOUNT_PROG $tmpbind
+ _umount $tmpdir
+ _umount $tmpbind
rmdir $tmpdir
rm -f $tmpsymlink
rmdir $tmpbind
@@ -22,7 +22,7 @@ _register_cleanup "_cleanup" BUS
_cleanup()
{
cd /
- test -n "$loop_mount" && $UMOUNT_PROG $loop_mount > /dev/null 2>&1
+ test -n "$loop_mount" && _umount $loop_mount > /dev/null 2>&1
test -n "$loop_dev" && _destroy_loop_device $loop_dev
rm -rf $tmp.*
}
@@ -14,7 +14,7 @@ _cleanup()
{
cd /
rm -f $tmp.*
- $UMOUNT_PROG $LOOP_MNT 2>/dev/null
+ _umount $LOOP_MNT 2>/dev/null
if [ -n "$LOOP_DEV" ];then
_destroy_loop_device $LOOP_DEV 2>/dev/null
fi
@@ -89,7 +89,7 @@ get_mount_info()
force_unmount()
{
- $UMOUNT_PROG $LOOP_MNT >/dev/null 2>&1
+ _umount $LOOP_MNT >/dev/null 2>&1
}
# _do_test <mount options> <should be mounted?> [<key string> <key should be found?>]
@@ -15,7 +15,7 @@ _cleanup()
_cleanup_dump
cd /
rm -r -f $tmp.*
- $UMOUNT_PROG $TEST_DIR/dest.$seq 2> /dev/null
+ _umount $TEST_DIR/dest.$seq 2> /dev/null
rmdir $TEST_DIR/src.$seq 2> /dev/null
rmdir $TEST_DIR/dest.$seq 2> /dev/null
}
@@ -23,7 +23,7 @@ _cleanup()
{
cd /
rm -r -f $tmp.*
- umount $dummymnt &>/dev/null
+ _umount $dummymnt &>/dev/null
rmdir $dummymnt &>/dev/null
rm -f $dummyfile
}
@@ -46,7 +46,7 @@ testme() {
XFS_SCRUB_PHASE=7 $XFS_SCRUB_PROG -d -o autofsck $dummymnt 2>&1 | \
grep autofsck | _filter_test_dir | \
sed -e 's/\(directive.\).*$/\1/g'
- umount $dummymnt
+ _umount $dummymnt
}
# We don't test the absence of an autofsck directive because xfs_scrub behaves