From e318dbd19883118885e8eb6c7375d0ca8a3699f6 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Wed, 16 Aug 2017 11:47:19 +0200 Subject: [PATCH] qa/run_xfstests.sh: drop *_MKFS_OPTIONS variables AFAICT ./check doesn't query EXT4_MKFS_OPTIONS or BTRFS_MKFS_OPTIONS, We don't need anything special for xfs, so remove all of them to avoid confusion. Signed-off-by: Ilya Dryomov (cherry picked from commit 7a0e45046d556c6624e0225ff006c31d8dbae2a8) --- qa/run_xfstests.sh | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/qa/run_xfstests.sh b/qa/run_xfstests.sh index b6c61d071ce69..0e100cc949153 100644 --- a/qa/run_xfstests.sh +++ b/qa/run_xfstests.sh @@ -49,9 +49,6 @@ SCRATCH_DEV="" # MUST BE SPECIFIED TEST_DEV="" # MUST BE SPECIFIED TESTS="-g auto" # The "auto" group is supposed to be "known good" -# We no longer need to set the stripe unit in XFS_MKFS_OPTIONS because recent -# versions of mkfs.xfs autodetect it. - # print an error message and quit with non-zero status function err() { if [ $# -gt 0 ]; then @@ -251,11 +248,6 @@ export PATH="${TESTDIR}/binary/usr/local/sbin:${PATH}" ################################################################ -# Filesystem-specific mkfs options--set if not supplied -#export XFS_MKFS_OPTIONS="${XFS_MKFS_OPTIONS:--f -l su=65536}" -export EXT4_MKFS_OPTIONS="${EXT4_MKFS_OPTIONS:--F}" -export BTRFS_MKFS_OPTION # No defaults - XFSTESTS_DIR="/var/lib/xfstests" # Where the tests live XFSPROGS_DIR="/tmp/cephtest/xfsprogs-install" XFSDUMP_DIR="/tmp/cephtest/xfsdump-install" @@ -317,8 +309,6 @@ function setup_host_options() { SCRATCH_MNT="${scratch_dir}" FSTYP="${FSTYP}" export TEST_DEV SCRATCH_DEV TEST_DIR SCRATCH_MNT FSTYP - # - export XFS_MKFS_OPTIONS="${XFS_MKFS_OPTIONS}" ! # Now ensure we are using the same values @@ -341,9 +331,9 @@ function do_mkfs() { local options case "${FSTYP}" in - xfs) options="${XFS_MKFS_OPTIONS}" ;; - ext4) options="${EXT4_MKFS_OPTIONS}" ;; - btrfs) options="${BTRFS_MKFS_OPTIONS}" ;; + xfs) options="-f" ;; + ext4) options="-F" ;; + btrfs) options="-f" ;; esac "mkfs.${FSTYP}" ${options} "${dev}" || -- 2.39.5