AWK_PROG=awk
# extra parameters for fsstress
-FSSTRESS_AVOID="-f resvsp=0 -f unresvsp=0"
+FSSTRESS_AVOID=
export AWK_PROG FSSTRESS_AVOID
TEST_OPTIONS="$TEST_OPTIONS -ortdev=$TEST_RTDEV"
[ "$USE_EXTERNAL" = yes -a ! -z "$TEST_LOGDEV" ] && \
TEST_OPTIONS="$TEST_OPTIONS -ologdev=$TEST_LOGDEV"
- mount -t xfs $TEST_OPTIONS $* $TEST_DEV $TEST_DIR
+ mount -t xfs $TEST_OPTIONS $MOUNT_OPTIONS $* $TEST_DEV $TEST_DIR
}
_scratch_mount_options()
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
- echo $SCRATCH_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
+ echo $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
}
_scratch_mount()
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ortdev=$SCRATCH_RTDEV"
[ "$USE_EXTERNAL" = yes -a ! -z "$SCRATCH_LOGDEV" ] && \
SCRATCH_OPTIONS="$SCRATCH_OPTIONS -ologdev=$SCRATCH_LOGDEV"
- mount -t xfs $SCRATCH_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
+ mount -t xfs $SCRATCH_OPTIONS $MOUNT_OPTIONS $* $SCRATCH_DEV $SCRATCH_MNT
}
_scratch_mkfs_options()
# $TEST_DEV is not mounted
if ! _test_mount
then
- echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
- exit 1
+ echo "common.rc: retrying test device mount with external set"
+ [ "$USE_EXTERNAL" != "yes" ] && USE_EXTERNAL=yes
+ if ! _test_mount
+ then
+ echo "common.rc: could not mount $TEST_DEV on $TEST_DIR"
+ exit 1
+ fi
fi
fi