From bf1d308e457e70fe4ec87b3a3b4540d983c168b8 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Sun, 18 Aug 2024 17:19:42 +0200 Subject: [PATCH] remove the separate rtgroups flag Signed-off-by: Christoph Hellwig --- common/xfs | 4 ---- tests/xfs/1856 | 10 +++++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/common/xfs b/common/xfs index 12c7eef25..ba2d711bb 100644 --- a/common/xfs +++ b/common/xfs @@ -1979,10 +1979,6 @@ _scratch_xfs_find_metafile() # Force metadata directories off. _scratch_xfs_force_no_metadir() { - if echo "$MKFS_OPTIONS" | grep -q 'rtgroups='; then - MKFS_OPTIONS="$(echo "$MKFS_OPTIONS" | sed -e 's/rtgroups=\([01]\)/rtgroups=0/g')" - fi - if echo "$MKFS_OPTIONS" | grep -q 'metadir='; then MKFS_OPTIONS="$(echo "$MKFS_OPTIONS" | sed -e 's/metadir=\([01]\)/metadir=0/g')" return diff --git a/tests/xfs/1856 b/tests/xfs/1856 index b37871766..344738645 100755 --- a/tests/xfs/1856 +++ b/tests/xfs/1856 @@ -33,7 +33,7 @@ rt_configured() # Does mkfs support rtgroups? supports_rtgroups() { - $MKFS_XFS_PROG 2>&1 | grep -q 'rtgroups=' + $MKFS_XFS_PROG 2>&1 | grep -q 'metadir=' } # Do we need to enable rtgroups at mkfs time to support a feature upgrade test? @@ -63,12 +63,12 @@ compute_mkfs_options() local caller_options="$MKFS_OPTIONS" local rtgroups - need_rtgroups "$feat" && rtgroups=1 - if echo "$caller_options" | grep -q 'rtgroups='; then + need_rtgroups "$feat" && metadir=1 + if echo "$caller_options" | grep -q 'metadir='; then test -z "$rtgroups" && rtgroups=0 - caller_options="$(echo "$caller_options" | sed -e 's/rtgroups=*[0-9]*/rtgroups='$rtgroups'/g')" + caller_options="$(echo "$caller_options" | sed -e 's/metadir=*[0-9]*/metadir='$rtgroups'/g')" elif [ -n "$rtgroups" ]; then - caller_options="$caller_options -r rtgroups=$rtgroups" + caller_options="$caller_options -m metadir=$rtgroups" fi for feat in "${FEATURES[@]}"; do -- 2.49.0