remove the separate rtgroups flag

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/common/xfs b/common/xfs
index 12c7eef25b2cfbc73e1ea2442fcadb39a1d76830..ba2d711bbe71163bab1d2f247ca5b8c0797c29f3 100644 (file)
--- 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 b37871766c8cd2b9fc1ca3c3d3b0c88db4ccfa39..3447386450e46220c9e46b78ed17a36dcd42f034 100755 (executable)
--- 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