From 65da6e9de34db600f32b63624815a07468bc4f03 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 12 Mar 2021 22:53:51 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/gfs2-utils.git#10ee050aa6083acdc0193bbadd149d609c880989
---
 .gitignore      |    1 +
 gfs2-utils.spec |    8 +-
 sources         |    2 +-
 tests/testsuite | 1878 +++++++++++++++++++++++++----------------------
 4 files changed, 1021 insertions(+), 868 deletions(-)

diff --git a/.gitignore b/.gitignore
index 17c9025..facb12a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /gfs2-utils-3.3.0.tar.gz
+/gfs2-utils-3.4.0.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 21945cc..8616ac3 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
-Version: 3.3.0
-Release: 3%{?dist}
+Version: 3.4.0
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -63,6 +63,10 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Mon Mar 08 2021 Andrew Price <anprice@redhat.com> - 3.4.0-1
+- New upstream version
+- Update testsuite script
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 8115dd5..f879e91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.3.0.tar.gz) = b5ed1fb91eaf88fd163b682a73a3f54efd000e513206aba90e6286e68d8b13c325373da1bde94c8f48c0d235b60f22f6269f9103c508aebf13b15d9470b745d0
+SHA512 (gfs2-utils-3.4.0.tar.gz) = 01d3f582705a5dc9ee9919d3cd5798118233797f1400a7d2387a2e5072cdc347c6d5c8140aa242c0d00a2b26f31ae19386938f22761c76b3dbfb7a71f97c7420
diff --git a/tests/testsuite b/tests/testsuite
index 2444415..7619c86 100755
--- a/tests/testsuite
+++ b/tests/testsuite
@@ -586,7 +586,8 @@ at_color=auto
 # List of the tested programs.
 at_tested='mkfs.gfs2
 fsck.gfs2
-gfs2_edit'
+gfs2_edit
+tunegfs2'
 # As many question marks as there are digits in the last test group number.
 # Used to normalize the test group numbers so that `ls' lists them in
 # numerical order.
@@ -597,39 +598,39 @@ at_help_all="1;mkfs.at:4;Locking protocol validation;mkfs.gfs2 mkfs;
 3;mkfs.at:15;Journal size validation;mkfs.gfs2 mkfs;
 4;mkfs.at:21;Block count validation;mkfs.gfs2 mkfs;
 5;mkfs.at:28;Quota change file size validation;mkfs.gfs2 mkfs;
-6;mkfs.at:34;Locking protocols;mkfs.gfs2 mkfs;
-7;mkfs.at:40;Valid block sizes 512-4096;mkfs.gfs2 mkfs;
-8;mkfs.at:48;Max. blocks, min. block size;mkfs.gfs2 mkfs;
-9;mkfs.at:53;Max. blocks, max. block size;mkfs.gfs2 mkfs;
-10;mkfs.at:58;Max. resource group size;mkfs.gfs2 mkfs;
-11;mkfs.at:63;Min. resource group size;mkfs.gfs2 mkfs;
-12;mkfs.at:68;Max. resource group size, min. block size;mkfs.gfs2 mkfs;
-13;mkfs.at:73;Max. journal size;mkfs.gfs2 mkfs;
-14;mkfs.at:78;Min. journal size;mkfs.gfs2 mkfs;
-15;mkfs.at:85;Max. quota change file size;mkfs.gfs2 mkfs;
-16;mkfs.at:90;Min. quota change file size;mkfs.gfs2 mkfs;
-17;mkfs.at:95;Lock table validation;mkfs.gfs2 mkfs;
-18;mkfs.at:114;Device i/o limits handling;mkfs.gfs2 mkfs;
-19;mkfs.at:125;Resource group alignment;mkfs.gfs2 mkfs;
-20;mkfs.at:134;Values of rg_skip;mkfs.gfs2 mkfs;
-21;mkfs.at:150;Values of rg_data0, rg_data, rg_bitbytes;mkfs.gfs2 mkfs;
-22;mkfs.at:166;Small filesystems;mkfs.gfs2 mkfs;
-23;fsck.at:4;Conflicting options;fsck.gfs2 fsck;
-24;fsck.at:15;Fix invalid block sizes;fsck.gfs2 fsck;
-25;fsck.at:24;Fix invalid goal blocks;fsck.gfs2 fsck;
-26;fsck.at:29;Fix bad resource group #0;fsck.gfs2 fsck;
-27;fsck.at:34;Fix bad resource group #1;fsck.gfs2 fsck;
-28;fsck.at:44;Fix bad rindex entry #1;fsck.gfs2 fsck;
-29;fsck.at:49;Rebuild bad journal;fsck.gfs2 fsck;
-30;fsck.at:58;gfs2 format versions;fsck.gfs2 fsck;
-31;edit.at:4;Save/restoremeta, defaults;gfs2_edit edit;
-32;edit.at:17;Save/restoremeta, no compression;gfs2_edit edit;
-33;edit.at:27;Save/restoremeta, min. block size;gfs2_edit edit;
-34;edit.at:37;Save/restoremeta, 4 journals;gfs2_edit edit;
-35;edit.at:47;Save/restoremeta, min. block size, 4 journals;gfs2_edit edit;
-36;edit.at:57;Save metadata to /dev/null;gfs2_edit edit;
-37;libgfs2.at:3;meta.c;libgfs2;
-38;libgfs2.at:7;rgrp.c;libgfs2;
+6;mkfs.at:34;Format version validation;mkfs.gfs2 mkfs;
+7;mkfs.at:44;Locking protocols;mkfs.gfs2 mkfs;
+8;mkfs.at:50;Valid block sizes 512-4096;mkfs.gfs2 mkfs;
+9;mkfs.at:58;Max. blocks, min. block size;mkfs.gfs2 mkfs;
+10;mkfs.at:63;Max. blocks, max. block size;mkfs.gfs2 mkfs;
+11;mkfs.at:68;Max. resource group size;mkfs.gfs2 mkfs;
+12;mkfs.at:73;Min. resource group size;mkfs.gfs2 mkfs;
+13;mkfs.at:78;Max. resource group size, min. block size;mkfs.gfs2 mkfs;
+14;mkfs.at:83;Max. journal size;mkfs.gfs2 mkfs;
+15;mkfs.at:88;Min. journal size;mkfs.gfs2 mkfs;
+16;mkfs.at:95;Max. quota change file size;mkfs.gfs2 mkfs;
+17;mkfs.at:100;Min. quota change file size;mkfs.gfs2 mkfs;
+18;mkfs.at:105;Lock table validation;mkfs.gfs2 mkfs;
+19;mkfs.at:124;Device i/o limits handling;mkfs.gfs2 mkfs;
+20;mkfs.at:135;Resource group alignment;mkfs.gfs2 mkfs;
+21;mkfs.at:144;Values of rg_skip;mkfs.gfs2 mkfs;
+22;mkfs.at:160;Values of rg_data0, rg_data, rg_bitbytes;mkfs.gfs2 mkfs;
+23;mkfs.at:176;Small filesystems;mkfs.gfs2 mkfs;
+24;fsck.at:4;Conflicting options;fsck.gfs2 fsck;
+25;fsck.at:15;Fix invalid block sizes;fsck.gfs2 fsck;
+26;fsck.at:24;Fix invalid goal blocks;fsck.gfs2 fsck;
+27;fsck.at:29;Fix bad resource group #0;fsck.gfs2 fsck;
+28;fsck.at:34;Fix bad resource group #1;fsck.gfs2 fsck;
+29;fsck.at:44;Fix bad rindex entry #1;fsck.gfs2 fsck;
+30;fsck.at:49;Rebuild bad journal;fsck.gfs2 fsck;
+31;fsck.at:58;gfs2 format versions;fsck.gfs2 fsck;
+32;edit.at:4;Save/restoremeta, defaults;gfs2_edit edit;
+33;edit.at:17;Save/restoremeta, no compression;gfs2_edit edit;
+34;edit.at:27;Save/restoremeta, min. block size;gfs2_edit edit;
+35;edit.at:37;Save/restoremeta, 4 journals;gfs2_edit edit;
+36;edit.at:47;Save/restoremeta, min. block size, 4 journals;gfs2_edit edit;
+37;edit.at:57;Save metadata to /dev/null;gfs2_edit edit;
+38;tune.at:4;Format version;tunegfs2 tune;
 "
 # List of the all the test groups.
 at_groups_all=`$as_echo "$at_help_all" | sed 's/;.*//'`
@@ -941,7 +942,7 @@ fi
 # List of tests.
 if $at_list_p; then
   cat <<_ATEOF || at_write_fail=1
-gfs2-utils 3.3.0.1.dev test suite test groups:
+gfs2-utils 3.4.0.1.dev test suite test groups:
 
  NUM: FILE-NAME:LINE     TEST-GROUP-NAME
       KEYWORDS
@@ -982,7 +983,7 @@ _ATEOF
   exit $at_write_fail
 fi
 if $at_version_p; then
-  $as_echo "$as_me (gfs2-utils 3.3.0.1.dev)" &&
+  $as_echo "$as_me (gfs2-utils 3.4.0.1.dev)" &&
   cat <<\_ATEOF || at_write_fail=1
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1003,14 +1004,14 @@ esac
 # Category starts at test group 1.
 at_banner_text_1="mkfs.gfs2 tests"
 # Banner 2. fsck.at:2
-# Category starts at test group 23.
+# Category starts at test group 24.
 at_banner_text_2="fsck.gfs2 tests"
 # Banner 3. edit.at:2
-# Category starts at test group 31.
+# Category starts at test group 32.
 at_banner_text_3="gfs2_edit tests"
-# Banner 4. libgfs2.at:1
-# Category starts at test group 37.
-at_banner_text_4="libgfs2 unit tests"
+# Banner 4. tune.at:2
+# Category starts at test group 38.
+at_banner_text_4="tunegfs2 tests"
 
 # Take any -C into account.
 if $at_change_dir ; then
@@ -1171,11 +1172,11 @@ exec 5>>"$at_suite_log"
 
 # Banners and logs.
 $as_echo "## ---------------------------------- ##
-## gfs2-utils 3.3.0.1.dev test suite. ##
+## gfs2-utils 3.4.0.1.dev test suite. ##
 ## ---------------------------------- ##"
 {
   $as_echo "## ---------------------------------- ##
-## gfs2-utils 3.3.0.1.dev test suite. ##
+## gfs2-utils 3.4.0.1.dev test suite. ##
 ## ---------------------------------- ##"
   echo
 
@@ -2019,7 +2020,7 @@ _ASBOX
   $as_echo "Please send $at_msg and all information you think might help:
 
    To: <cluster-devel@redhat.com>
-   Subject: [gfs2-utils 3.3.0.1.dev] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
+   Subject: [gfs2-utils 3.4.0.1.dev] $as_me: $at_fail_list${at_fail_list:+ failed${at_xpass_list:+, }}$at_xpass_list${at_xpass_list:+ passed unexpectedly}
 
 You may investigate any problem if you feel able to do so, in which
 case the test suite provides a good starting point.  Its output may
@@ -2238,7 +2239,7 @@ read at_status <"$at_status_file"
 #AT_STOP_5
 #AT_START_6
 at_fn_group_banner 6 'mkfs.at:34' \
-  "Locking protocols" "                              " 1
+  "Format version validation" "                      " 1
 at_xfail=no
 (
   $as_echo "6. $at_setup_line: testing $at_desc ..."
@@ -2246,86 +2247,80 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:36: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:36"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
+$as_echo "$at_srcdir/mkfs.at:36: \$GFS_MKFS -p lock_nolock -o format=-1 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=-1 $GFS_TGT" "mkfs.at:36"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=-1 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:36"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-$as_echo "mkfs.at:36" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:36"
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:36: \$GFS_MKFS -p lock_nolock \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock $GFS_TGT" "mkfs.at:36"
-( $at_check_trace; $GFS_MKFS -p lock_nolock $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:36"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:36"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:36: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:36"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:37: \$GFS_MKFS -p lock_nolock -o format=0 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=0 $GFS_TGT" "mkfs.at:37"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=0 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:36"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:37"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:37: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:37"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
+$as_echo "$at_srcdir/mkfs.at:38: \$GFS_MKFS -p lock_nolock -o format=1800 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=1800 $GFS_TGT" "mkfs.at:38"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=1800 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:37"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-$as_echo "mkfs.at:37" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:37"
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:37: \$GFS_MKFS -p lock_dlm -t foo:bar \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t foo:bar $GFS_TGT" "mkfs.at:37"
-( $at_check_trace; $GFS_MKFS -p lock_dlm -t foo:bar $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:37"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:38"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:37: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:37"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:39: \$GFS_MKFS -p lock_nolock -o format=1801 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=1801 $GFS_TGT" "mkfs.at:39"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=1801 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:37"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:39"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:40: \$GFS_MKFS -p lock_nolock -o format=1802 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=1802 $GFS_TGT" "mkfs.at:40"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=1802 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:40"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:41: \$GFS_MKFS -p lock_nolock -o format=1803 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=1803 $GFS_TGT" "mkfs.at:41"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=1803 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:41"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2335,8 +2330,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_6
 #AT_START_7
-at_fn_group_banner 7 'mkfs.at:40' \
-  "Valid block sizes 512-4096" "                     " 1
+at_fn_group_banner 7 'mkfs.at:44' \
+  "Locking protocols" "                              " 1
 at_xfail=no
 (
   $as_echo "7. $at_setup_line: testing $at_desc ..."
@@ -2344,170 +2339,86 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:42: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:42"
+$as_echo "$at_srcdir/mkfs.at:46: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:46"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:42"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:46"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:42" >"$at_check_line_file"
+$as_echo "mkfs.at:46" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:42"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:46"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:42: \$GFS_MKFS -p lock_nolock -b 512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT" "mkfs.at:42"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:46: \$GFS_MKFS -p lock_nolock \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock $GFS_TGT" "mkfs.at:46"
+( $at_check_trace; $GFS_MKFS -p lock_nolock $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:42"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:46"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:42: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:42"
+$as_echo "$at_srcdir/mkfs.at:46: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:46"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:42"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:46"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:43: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:43"
+$as_echo "$at_srcdir/mkfs.at:47: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:47"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:43"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:47"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:43" >"$at_check_line_file"
+$as_echo "mkfs.at:47" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:43"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:47"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:43: \$GFS_MKFS -p lock_nolock -b 1024 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT" "mkfs.at:43"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:47: \$GFS_MKFS -p lock_dlm -t foo:bar \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t foo:bar $GFS_TGT" "mkfs.at:47"
+( $at_check_trace; $GFS_MKFS -p lock_dlm -t foo:bar $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:43"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:47"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:43: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:43"
+$as_echo "$at_srcdir/mkfs.at:47: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:47"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:43"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:44: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:44"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:44"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-$as_echo "mkfs.at:44" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:44"
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:44: \$GFS_MKFS -p lock_nolock -b 2048 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 2048 $GFS_TGT" "mkfs.at:44"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 2048 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:44"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:44: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:44"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:44"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:45: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:45"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:45"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-$as_echo "mkfs.at:45" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:45"
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:45: \$GFS_MKFS -p lock_nolock -b 4096 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT" "mkfs.at:45"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:45"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:45: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:45"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:45"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:47"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2517,8 +2428,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_7
 #AT_START_8
-at_fn_group_banner 8 'mkfs.at:48' \
-  "Max. blocks, min. block size" "                   " 1
+at_fn_group_banner 8 'mkfs.at:50' \
+  "Valid block sizes 512-4096" "                     " 1
 at_xfail=no
 (
   $as_echo "8. $at_setup_line: testing $at_desc ..."
@@ -2526,60 +2437,130 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:50: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:50"
+$as_echo "$at_srcdir/mkfs.at:52: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:52"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:50"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:52"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:50" >"$at_check_line_file"
+$as_echo "mkfs.at:52" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:50"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:52"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:50: \$GFS_MKFS -p lock_nolock -b 512 \$GFS_TGT \$(gfs_max_blocks 512)"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "mkfs.at:50"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 512 $GFS_TGT $(gfs_max_blocks 512)
+$as_echo "$at_srcdir/mkfs.at:52: \$GFS_MKFS -p lock_nolock -b 512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 512 $GFS_TGT" "mkfs.at:52"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:50"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:52"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:50: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:50"
+$as_echo "$at_srcdir/mkfs.at:52: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:52"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:50"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:52"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-  set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_8
-#AT_START_9
-at_fn_group_banner 9 'mkfs.at:53' \
-  "Max. blocks, max. block size" "                   " 1
-at_xfail=no
-(
-  $as_echo "9. $at_setup_line: testing $at_desc ..."
-  $at_traceon
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:53: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:53"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:53"
+$at_failed && at_fn_log_failure
+$at_traceon; }
 
+$as_echo "mkfs.at:53" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:53"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:53: \$GFS_MKFS -p lock_nolock -b 1024 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT" "mkfs.at:53"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:53"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:53: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:53"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:53"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:54: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:54"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:54"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+$as_echo "mkfs.at:54" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:54"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:54: \$GFS_MKFS -p lock_nolock -b 2048 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 2048 $GFS_TGT" "mkfs.at:54"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 2048 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:54"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:54: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:54"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:54"
+$at_failed && at_fn_log_failure
+$at_traceon; }
 
 { set +x
 $as_echo "$at_srcdir/mkfs.at:55: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
@@ -2598,9 +2579,9 @@ $as_echo "mkfs.at:55" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
   && at_fn_check_skip 77 "$at_srcdir/mkfs.at:55"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:55: \$GFS_MKFS -p lock_nolock -b 4096 \$GFS_TGT \$(gfs_max_blocks 4096)"
-at_fn_check_prepare_notrace 'a $(...) command substitution' "mkfs.at:55"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(gfs_max_blocks 4096)
+$as_echo "$at_srcdir/mkfs.at:55: \$GFS_MKFS -p lock_nolock -b 4096 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT" "mkfs.at:55"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -2627,13 +2608,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_9
-#AT_START_10
-at_fn_group_banner 10 'mkfs.at:58' \
-  "Max. resource group size" "                       " 1
+#AT_STOP_8
+#AT_START_9
+at_fn_group_banner 9 'mkfs.at:58' \
+  "Max. blocks, min. block size" "                   " 1
 at_xfail=no
 (
-  $as_echo "10. $at_setup_line: testing $at_desc ..."
+  $as_echo "9. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -2654,9 +2635,9 @@ $as_echo "mkfs.at:60" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
   && at_fn_check_skip 77 "$at_srcdir/mkfs.at:60"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:60: \$GFS_MKFS -p lock_nolock -r 2048 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT" "mkfs.at:60"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:60: \$GFS_MKFS -p lock_nolock -b 512 \$GFS_TGT \$(gfs_max_blocks 512)"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "mkfs.at:60"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 512 $GFS_TGT $(gfs_max_blocks 512)
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -2683,13 +2664,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_10
-#AT_START_11
-at_fn_group_banner 11 'mkfs.at:63' \
-  "Min. resource group size" "                       " 1
+#AT_STOP_9
+#AT_START_10
+at_fn_group_banner 10 'mkfs.at:63' \
+  "Max. blocks, max. block size" "                   " 1
 at_xfail=no
 (
-  $as_echo "11. $at_setup_line: testing $at_desc ..."
+  $as_echo "10. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -2710,9 +2691,9 @@ $as_echo "mkfs.at:65" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
   && at_fn_check_skip 77 "$at_srcdir/mkfs.at:65"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:65: \$GFS_MKFS -p lock_nolock -r 32 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT" "mkfs.at:65"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 32 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:65: \$GFS_MKFS -p lock_nolock -b 4096 \$GFS_TGT \$(gfs_max_blocks 4096)"
+at_fn_check_prepare_notrace 'a $(...) command substitution' "mkfs.at:65"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 4096 $GFS_TGT $(gfs_max_blocks 4096)
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -2739,13 +2720,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_11
-#AT_START_12
-at_fn_group_banner 12 'mkfs.at:68' \
-  "Max. resource group size, min. block size" "      " 1
+#AT_STOP_10
+#AT_START_11
+at_fn_group_banner 11 'mkfs.at:68' \
+  "Max. resource group size" "                       " 1
 at_xfail=no
 (
-  $as_echo "12. $at_setup_line: testing $at_desc ..."
+  $as_echo "11. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -2766,9 +2747,9 @@ $as_echo "mkfs.at:70" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
   && at_fn_check_skip 77 "$at_srcdir/mkfs.at:70"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:70: \$GFS_MKFS -p lock_nolock -r 2048 -b 512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 -b 512 $GFS_TGT" "mkfs.at:70"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 -b 512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:70: \$GFS_MKFS -p lock_nolock -r 2048 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT" "mkfs.at:70"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -2795,13 +2776,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_12
-#AT_START_13
-at_fn_group_banner 13 'mkfs.at:73' \
-  "Max. journal size" "                              " 1
+#AT_STOP_11
+#AT_START_12
+at_fn_group_banner 12 'mkfs.at:73' \
+  "Min. resource group size" "                       " 1
 at_xfail=no
 (
-  $as_echo "13. $at_setup_line: testing $at_desc ..."
+  $as_echo "12. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -2822,9 +2803,9 @@ $as_echo "mkfs.at:75" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
   && at_fn_check_skip 77 "$at_srcdir/mkfs.at:75"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:75: \$GFS_MKFS -p lock_nolock -J 1024 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT" "mkfs.at:75"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:75: \$GFS_MKFS -p lock_nolock -r 32 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT" "mkfs.at:75"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 32 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -2851,13 +2832,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_13
-#AT_START_14
-at_fn_group_banner 14 'mkfs.at:78' \
-  "Min. journal size" "                              " 1
+#AT_STOP_12
+#AT_START_13
+at_fn_group_banner 13 'mkfs.at:78' \
+  "Max. resource group size, min. block size" "      " 1
 at_xfail=no
 (
-  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $as_echo "13. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -2878,9 +2859,9 @@ $as_echo "mkfs.at:80" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
   && at_fn_check_skip 77 "$at_srcdir/mkfs.at:80"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:80: \$GFS_MKFS -p lock_nolock -J 8 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -J 8 $GFS_TGT" "mkfs.at:80"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -J 8 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:80: \$GFS_MKFS -p lock_nolock -r 2048 -b 512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 -b 512 $GFS_TGT" "mkfs.at:80"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 -b 512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -2903,59 +2884,59 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:80"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_13
+#AT_START_14
+at_fn_group_banner 14 'mkfs.at:83' \
+  "Max. journal size" "                              " 1
+at_xfail=no
+(
+  $as_echo "14. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
 { set +x
-$as_echo "$at_srcdir/mkfs.at:81: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:81"
+$as_echo "$at_srcdir/mkfs.at:85: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:85"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:81"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:85"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:81" >"$at_check_line_file"
+$as_echo "mkfs.at:85" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:81"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:85"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:81: \$GFS_MKFS -p lock_nolock -b 1024 \$GFS_TGT 511996"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT 511996" "mkfs.at:81"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT 511996
+$as_echo "$at_srcdir/mkfs.at:85: \$GFS_MKFS -p lock_nolock -J 1024 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT" "mkfs.at:85"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -J 1024 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:81"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:85"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:81: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:81"
+$as_echo "$at_srcdir/mkfs.at:85: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:85"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:81"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:82: gfs2_edit -p journal0 field di_size \$GFS_TGT | tr -d '\\n'"
-at_fn_check_prepare_notrace 'a shell pipeline' "mkfs.at:82"
-( $at_check_trace; gfs2_edit -p journal0 field di_size $GFS_TGT | tr -d '\n'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo >>"$at_stdout"; $as_echo "8388608" | \
-  $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:82"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:85"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -2965,8 +2946,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_14
 #AT_START_15
-at_fn_group_banner 15 'mkfs.at:85' \
-  "Max. quota change file size" "                    " 1
+at_fn_group_banner 15 'mkfs.at:88' \
+  "Min. journal size" "                              " 1
 at_xfail=no
 (
   $as_echo "15. $at_setup_line: testing $at_desc ..."
@@ -2974,44 +2955,100 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:87: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:87"
+$as_echo "$at_srcdir/mkfs.at:90: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:90"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:87"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:90"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:87" >"$at_check_line_file"
+$as_echo "mkfs.at:90" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:87"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:90"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:87: \$GFS_MKFS -p lock_nolock -c 64 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -c 64 $GFS_TGT" "mkfs.at:87"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -c 64 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:90: \$GFS_MKFS -p lock_nolock -J 8 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -J 8 $GFS_TGT" "mkfs.at:90"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -J 8 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:87"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:90"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:87: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:87"
+$as_echo "$at_srcdir/mkfs.at:90: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:90"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:87"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:90"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:91: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:91"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:91"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+$as_echo "mkfs.at:91" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:91"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:91: \$GFS_MKFS -p lock_nolock -b 1024 \$GFS_TGT 511996"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT 511996" "mkfs.at:91"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -b 1024 $GFS_TGT 511996
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:91"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:91: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:91"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:91"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:92: gfs2_edit -p journal0 field di_size \$GFS_TGT | tr -d '\\n'"
+at_fn_check_prepare_notrace 'a shell pipeline' "mkfs.at:92"
+( $at_check_trace; gfs2_edit -p journal0 field di_size $GFS_TGT | tr -d '\n'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo >>"$at_stdout"; $as_echo "8388608" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:92"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3021,8 +3058,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_15
 #AT_START_16
-at_fn_group_banner 16 'mkfs.at:90' \
-  "Min. quota change file size" "                    " 1
+at_fn_group_banner 16 'mkfs.at:95' \
+  "Max. quota change file size" "                    " 1
 at_xfail=no
 (
   $as_echo "16. $at_setup_line: testing $at_desc ..."
@@ -3030,44 +3067,44 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:92: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:92"
+$as_echo "$at_srcdir/mkfs.at:97: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:97"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:92"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:97"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:92" >"$at_check_line_file"
+$as_echo "mkfs.at:97" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:92"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:97"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:92: \$GFS_MKFS -p lock_nolock -c 1 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -c 1 $GFS_TGT" "mkfs.at:92"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -c 1 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:97: \$GFS_MKFS -p lock_nolock -c 64 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -c 64 $GFS_TGT" "mkfs.at:97"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -c 64 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:92"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:97"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:92: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:92"
+$as_echo "$at_srcdir/mkfs.at:97: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:97"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:92"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:97"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3077,8 +3114,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_16
 #AT_START_17
-at_fn_group_banner 17 'mkfs.at:95' \
-  "Lock table validation" "                          " 1
+at_fn_group_banner 17 'mkfs.at:100' \
+  "Min. quota change file size" "                    " 1
 at_xfail=no
 (
   $as_echo "17. $at_setup_line: testing $at_desc ..."
@@ -3086,164 +3123,44 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:97: \$GFS_MKFS -p lock_nolock -t \"\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"\" $GFS_TGT" "mkfs.at:97"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -t "" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:97"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:98: \$GFS_MKFS -p lock_nolock -t \"123456789012345678901234567890123:12345678\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"123456789012345678901234567890123:12345678\" $GFS_TGT" "mkfs.at:98"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -t "123456789012345678901234567890123:12345678" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:98"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:99: \$GFS_MKFS -p lock_nolock -t \"12345678901234567:1234567890123456789012345678901\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"12345678901234567:1234567890123456789012345678901\" $GFS_TGT" "mkfs.at:99"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -t "12345678901234567:1234567890123456789012345678901" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:99"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:100: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:100"
+$as_echo "$at_srcdir/mkfs.at:102: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:102"
 ( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:100"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:102"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:100" >"$at_check_line_file"
+$as_echo "mkfs.at:102" >"$at_check_line_file"
 (test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:100"
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:102"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:100: \$GFS_MKFS -p lock_nolock -t \"12345678901234567890123456789012:123456789012345678901234567890\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"12345678901234567890123456789012:123456789012345678901234567890\" $GFS_TGT" "mkfs.at:100"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -t "12345678901234567890123456789012:123456789012345678901234567890" $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:102: \$GFS_MKFS -p lock_nolock -c 1 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -c 1 $GFS_TGT" "mkfs.at:102"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -c 1 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:100"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:102"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:100: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:100"
+$as_echo "$at_srcdir/mkfs.at:102: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:102"
 ( $at_check_trace; fsck.gfs2 -n $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:100"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:101: \$GFS_MKFS -p lock_dlm -t \"\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"\" $GFS_TGT" "mkfs.at:101"
-( $at_check_trace; $GFS_MKFS -p lock_dlm -t "" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:101"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:102: \$GFS_MKFS -p lock_dlm -t \"quite_long_cluster_name_test_here:intec34p\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"quite_long_cluster_name_test_here:intec34p\" $GFS_TGT" "mkfs.at:102"
-( $at_check_trace; $GFS_MKFS -p lock_dlm -t "quite_long_cluster_name_test_here:intec34p" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:102"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:103: \$GFS_MKFS -p lock_dlm -t \"financial_cluster:this_time_we_test_fs_naming_len\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"financial_cluster:this_time_we_test_fs_naming_len\" $GFS_TGT" "mkfs.at:103"
-( $at_check_trace; $GFS_MKFS -p lock_dlm -t "financial_cluster:this_time_we_test_fs_naming_len" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:103"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:104: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:104"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:104"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-$as_echo "mkfs.at:104" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:104"
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:104: \$GFS_MKFS -p lock_dlm -t \"a_really_long_named_cluster_here:concurrently_lets_check_fs_len\" \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"a_really_long_named_cluster_here:concurrently_lets_check_fs_len\" $GFS_TGT" "mkfs.at:104"
-( $at_check_trace; $GFS_MKFS -p lock_dlm -t "a_really_long_named_cluster_here:concurrently_lets_check_fs_len" $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:104"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:104: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:104"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:104"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:102"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3253,8 +3170,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_17
 #AT_START_18
-at_fn_group_banner 18 'mkfs.at:114' \
-  "Device i/o limits handling" "                     " 1
+at_fn_group_banner 18 'mkfs.at:105' \
+  "Lock table validation" "                          " 1
 at_xfail=no
 (
   $as_echo "18. $at_setup_line: testing $at_desc ..."
@@ -3262,83 +3179,164 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:116: \$GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 $GFS_TGT" "mkfs.at:116"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:107: \$GFS_MKFS -p lock_nolock -t \"\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"\" $GFS_TGT" "mkfs.at:107"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -t "" $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:116"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:107"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:117: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 $GFS_TGT" "mkfs.at:117"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:108: \$GFS_MKFS -p lock_nolock -t \"123456789012345678901234567890123:12345678\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"123456789012345678901234567890123:12345678\" $GFS_TGT" "mkfs.at:108"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -t "123456789012345678901234567890123:12345678" $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:117"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:108"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:118: gfs2_edit -p sb field sb_bsize \$GFS_TGT | tr -d '\\n' "
-at_fn_check_prepare_notrace 'a shell pipeline' "mkfs.at:118"
-( $at_check_trace; gfs2_edit -p sb field sb_bsize $GFS_TGT | tr -d '\n'
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo >>"$at_stdout"; $as_echo "4096" | \
-  $at_diff - "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:118"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:119: \$GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 $GFS_TGT" "mkfs.at:119"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:109: \$GFS_MKFS -p lock_nolock -t \"12345678901234567:1234567890123456789012345678901\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"12345678901234567:1234567890123456789012345678901\" $GFS_TGT" "mkfs.at:109"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -t "12345678901234567:1234567890123456789012345678901" $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:119"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:109"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:120: \$GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 $GFS_TGT" "mkfs.at:120"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo >>"$at_stderr"; $as_echo "Warning: device is not properly aligned. This may harm performance.
-" | \
-  $at_diff - "$at_stderr" || at_failed=:
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:120"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:122: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:4194304:8388608:512 -b 1024 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:4194304:8388608:512 -b 1024 $GFS_TGT" "mkfs.at:122"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:4194304:8388608:512 -b 1024 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:110: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:110"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:122"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:110"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+$as_echo "mkfs.at:110" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:110"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:110: \$GFS_MKFS -p lock_nolock -t \"12345678901234567890123456789012:123456789012345678901234567890\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -t \"12345678901234567890123456789012:123456789012345678901234567890\" $GFS_TGT" "mkfs.at:110"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -t "12345678901234567890123456789012:123456789012345678901234567890" $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:110"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:110: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:110"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:110"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:111: \$GFS_MKFS -p lock_dlm -t \"\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"\" $GFS_TGT" "mkfs.at:111"
+( $at_check_trace; $GFS_MKFS -p lock_dlm -t "" $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:111"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:112: \$GFS_MKFS -p lock_dlm -t \"quite_long_cluster_name_test_here:intec34p\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"quite_long_cluster_name_test_here:intec34p\" $GFS_TGT" "mkfs.at:112"
+( $at_check_trace; $GFS_MKFS -p lock_dlm -t "quite_long_cluster_name_test_here:intec34p" $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:112"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:113: \$GFS_MKFS -p lock_dlm -t \"financial_cluster:this_time_we_test_fs_naming_len\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"financial_cluster:this_time_we_test_fs_naming_len\" $GFS_TGT" "mkfs.at:113"
+( $at_check_trace; $GFS_MKFS -p lock_dlm -t "financial_cluster:this_time_we_test_fs_naming_len" $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 255 $at_status "$at_srcdir/mkfs.at:113"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:114: rm -f \$GFS_TGT && truncate -s \${GFS_TGT_SZ}G \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:114"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s ${GFS_TGT_SZ}G ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:114"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+$as_echo "mkfs.at:114" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:114"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:114: \$GFS_MKFS -p lock_dlm -t \"a_really_long_named_cluster_here:concurrently_lets_check_fs_len\" \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_dlm -t \"a_really_long_named_cluster_here:concurrently_lets_check_fs_len\" $GFS_TGT" "mkfs.at:114"
+( $at_check_trace; $GFS_MKFS -p lock_dlm -t "a_really_long_named_cluster_here:concurrently_lets_check_fs_len" $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:114"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:114: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:114"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:114"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3348,8 +3346,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_18
 #AT_START_19
-at_fn_group_banner 19 'mkfs.at:125' \
-  "Resource group alignment" "                       " 1
+at_fn_group_banner 19 'mkfs.at:124' \
+  "Device i/o limits handling" "                     " 1
 at_xfail=no
 (
   $as_echo "19. $at_setup_line: testing $at_desc ..."
@@ -3357,9 +3355,22 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:127: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT" "mkfs.at:127"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:126: \$GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 $GFS_TGT" "mkfs.at:126"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:126"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:127: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 $GFS_TGT" "mkfs.at:127"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3369,11 +3380,24 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:127"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-# Check rgrp alignment to minimum_io_size: 65536 / 4096 == 16
 { set +x
-$as_echo "$at_srcdir/mkfs.at:129: gfs2_edit -p rindex \$GFS_TGT | grep ri_addr | awk '{print \$2, \$2 % 16; if (\$2 % 16 != 0) { exit 1 }}'"
-at_fn_check_prepare_notrace 'a shell pipeline' "mkfs.at:129"
-( $at_check_trace; gfs2_edit -p rindex $GFS_TGT | grep ri_addr | awk '{print $2, $2 % 16; if ($2 % 16 != 0) { exit 1 }}'
+$as_echo "$at_srcdir/mkfs.at:128: gfs2_edit -p sb field sb_bsize \$GFS_TGT | tr -d '\\n' "
+at_fn_check_prepare_notrace 'a shell pipeline' "mkfs.at:128"
+( $at_check_trace; gfs2_edit -p sb field sb_bsize $GFS_TGT | tr -d '\n'
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo >>"$at_stdout"; $as_echo "4096" | \
+  $at_diff - "$at_stdout" || at_failed=:
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:128"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:129: \$GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 $GFS_TGT" "mkfs.at:129"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3383,17 +3407,31 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:129"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-# rhbz#1698858
 { set +x
-$as_echo "$at_srcdir/mkfs.at:131: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:131072:6291456:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:131072:6291456:512 $GFS_TGT" "mkfs.at:131"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:131072:6291456:512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:130: \$GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 $GFS_TGT" "mkfs.at:130"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo >>"$at_stderr"; $as_echo "Warning: device is not properly aligned. This may harm performance.
+" | \
+  $at_diff - "$at_stderr" || at_failed=:
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:130"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:132: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:4194304:8388608:512 -b 1024 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:4194304:8388608:512 -b 1024 $GFS_TGT" "mkfs.at:132"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:4194304:8388608:512 -b 1024 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:131"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:132"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
@@ -3403,8 +3441,8 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_19
 #AT_START_20
-at_fn_group_banner 20 'mkfs.at:134' \
-  "Values of rg_skip" "                              " 1
+at_fn_group_banner 20 'mkfs.at:135' \
+  "Resource group alignment" "                       " 1
 at_xfail=no
 (
   $as_echo "20. $at_setup_line: testing $at_desc ..."
@@ -3412,22 +3450,9 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:136: \$GFS_MKFS -p lock_nolock -r 2048 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT" "mkfs.at:136"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:136"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:137: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:137"
-( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/mkfs.at:137: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT" "mkfs.at:137"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3437,23 +3462,11 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:137"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
+# Check rgrp alignment to minimum_io_size: 65536 / 4096 == 16
 { set +x
-$as_echo "$at_srcdir/mkfs.at:138: \$GFS_MKFS -p lock_nolock -r 1024 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT" "mkfs.at:138"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:138"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:139: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:139"
-( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/mkfs.at:139: gfs2_edit -p rindex \$GFS_TGT | grep ri_addr | awk '{print \$2, \$2 % 16; if (\$2 % 16 != 0) { exit 1 }}'"
+at_fn_check_prepare_notrace 'a shell pipeline' "mkfs.at:139"
+( $at_check_trace; gfs2_edit -p rindex $GFS_TGT | grep ri_addr | awk '{print $2, $2 % 16; if ($2 % 16 != 0) { exit 1 }}'
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3463,23 +3476,11 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:139"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
+# rhbz#1698858
 { set +x
-$as_echo "$at_srcdir/mkfs.at:140: \$GFS_MKFS -p lock_nolock -r 512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 512 $GFS_TGT" "mkfs.at:140"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 512 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:140"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:141: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:141"
-( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/mkfs.at:141: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:131072:6291456:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:131072:6291456:512 $GFS_TGT" "mkfs.at:141"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:131072:6291456:512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3489,62 +3490,24 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:141"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:142: \$GFS_MKFS -p lock_nolock -r 219 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 219 $GFS_TGT" "mkfs.at:142"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 219 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:142"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_20
+#AT_START_21
+at_fn_group_banner 21 'mkfs.at:144' \
+  "Values of rg_skip" "                              " 1
+at_xfail=no
+(
+  $as_echo "21. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:143: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:143"
-( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:143"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:144: \$GFS_MKFS -p lock_nolock -r 32 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT" "mkfs.at:144"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 32 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:144"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:145: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:145"
-( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:145"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:146: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT" "mkfs.at:146"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:146: \$GFS_MKFS -p lock_nolock -r 2048 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT" "mkfs.at:146"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3567,24 +3530,62 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:147"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-  set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_20
-#AT_START_21
-at_fn_group_banner 21 'mkfs.at:150' \
-  "Values of rg_data0, rg_data, rg_bitbytes" "       " 1
-at_xfail=no
-(
-  $as_echo "21. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:148: \$GFS_MKFS -p lock_nolock -r 1024 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT" "mkfs.at:148"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:148"
+$at_failed && at_fn_log_failure
+$at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:152: \$GFS_MKFS -p lock_nolock -r 2048 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT" "mkfs.at:152"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:149: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:149"
+( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:149"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:150: \$GFS_MKFS -p lock_nolock -r 512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 512 $GFS_TGT" "mkfs.at:150"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 512 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:150"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:151: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:151"
+( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:151"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:152: \$GFS_MKFS -p lock_nolock -r 219 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 219 $GFS_TGT" "mkfs.at:152"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 219 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3595,9 +3596,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:153: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:153"
-( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/mkfs.at:153: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:153"
+( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3608,9 +3609,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:154: \$GFS_MKFS -p lock_nolock -r 1024 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT" "mkfs.at:154"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:154: \$GFS_MKFS -p lock_nolock -r 32 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT" "mkfs.at:154"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 32 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3621,9 +3622,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:155: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:155"
-( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/mkfs.at:155: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:155"
+( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3634,9 +3635,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:156: \$GFS_MKFS -p lock_nolock -r 512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 512 $GFS_TGT" "mkfs.at:156"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:156: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT" "mkfs.at:156"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3647,9 +3648,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:157: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:157"
-( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/mkfs.at:157: rgskipcheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:157"
+( $at_check_trace; rgskipcheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3659,62 +3660,24 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:157"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:158: \$GFS_MKFS -p lock_nolock -r 219 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 219 $GFS_TGT" "mkfs.at:158"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 219 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:158"
-$at_failed && at_fn_log_failure
-$at_traceon; }
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_21
+#AT_START_22
+at_fn_group_banner 22 'mkfs.at:160' \
+  "Values of rg_data0, rg_data, rg_bitbytes" "       " 1
+at_xfail=no
+(
+  $as_echo "22. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:159: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:159"
-( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:159"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:160: \$GFS_MKFS -p lock_nolock -r 32 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT" "mkfs.at:160"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -r 32 $GFS_TGT
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:160"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:161: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:161"
-( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:161"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/mkfs.at:162: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT" "mkfs.at:162"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:162: \$GFS_MKFS -p lock_nolock -r 2048 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT" "mkfs.at:162"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 2048 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3737,40 +3700,75 @@ at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:163"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-  set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
-#AT_STOP_21
-#AT_START_22
-at_fn_group_banner 22 'mkfs.at:166' \
-  "Small filesystems" "                              " 1
-at_xfail=no
-(
-  $as_echo "22. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
-
 { set +x
-$as_echo "$at_srcdir/mkfs.at:168: rm -f \$GFS_TGT && truncate -s 32M \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:168"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s 32M ${GFS_TGT}
+$as_echo "$at_srcdir/mkfs.at:164: \$GFS_MKFS -p lock_nolock -r 1024 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT" "mkfs.at:164"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 1024 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:168"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:164"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:168" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:168"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:169: \$GFS_MKFS -p lock_nolock \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock $GFS_TGT" "mkfs.at:169"
-( $at_check_trace; $GFS_MKFS -p lock_nolock $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:165: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:165"
+( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:165"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:166: \$GFS_MKFS -p lock_nolock -r 512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 512 $GFS_TGT" "mkfs.at:166"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 512 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:166"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:167: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:167"
+( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:167"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:168: \$GFS_MKFS -p lock_nolock -r 219 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 219 $GFS_TGT" "mkfs.at:168"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 219 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:168"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:169: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:169"
+( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3781,9 +3779,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:170: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:170"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:170: \$GFS_MKFS -p lock_nolock -r 32 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -r 32 $GFS_TGT" "mkfs.at:170"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -r 32 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3794,25 +3792,22 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:171: rm -f \$GFS_TGT && truncate -s 64M \${GFS_TGT}"
-at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:171"
-( $at_check_trace; rm -f $GFS_TGT && truncate -s 64M ${GFS_TGT}
+$as_echo "$at_srcdir/mkfs.at:171: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:171"
+( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_skip $at_status "$at_srcdir/mkfs.at:171"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:171"
 $at_failed && at_fn_log_failure
 $at_traceon; }
 
-$as_echo "mkfs.at:171" >"$at_check_line_file"
-(test ! -f ${GFS_TGT}) \
-  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:171"
 { set +x
-$as_echo "$at_srcdir/mkfs.at:172: \$GFS_MKFS -p lock_nolock -j2 \$GFS_TGT"
-at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -j2 $GFS_TGT" "mkfs.at:172"
-( $at_check_trace; $GFS_MKFS -p lock_nolock -j2 $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:172: \$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT" "mkfs.at:172"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o test_topology=0:512:65536:393216:512 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3823,9 +3818,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/mkfs.at:173: fsck.gfs2 -n \$GFS_TGT"
-at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:173"
-( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+$as_echo "$at_srcdir/mkfs.at:173: rgrifieldscheck.sh \$GFS_TGT; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+at_fn_check_prepare_dynamic "rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "mkfs.at:173"
+( $at_check_trace; rgrifieldscheck.sh $GFS_TGT; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -3841,14 +3836,112 @@ $at_traceon; }
 read at_status <"$at_status_file"
 #AT_STOP_22
 #AT_START_23
-at_fn_group_banner 23 'fsck.at:4' \
-  "Conflicting options" "                            " 2
+at_fn_group_banner 23 'mkfs.at:176' \
+  "Small filesystems" "                              " 1
 at_xfail=no
 (
   $as_echo "23. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:178: rm -f \$GFS_TGT && truncate -s 32M \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:178"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s 32M ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:178"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+$as_echo "mkfs.at:178" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:178"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:179: \$GFS_MKFS -p lock_nolock \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock $GFS_TGT" "mkfs.at:179"
+( $at_check_trace; $GFS_MKFS -p lock_nolock $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:179"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:180: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:180"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:180"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:181: rm -f \$GFS_TGT && truncate -s 64M \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "mkfs.at:181"
+( $at_check_trace; rm -f $GFS_TGT && truncate -s 64M ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_skip $at_status "$at_srcdir/mkfs.at:181"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+$as_echo "mkfs.at:181" >"$at_check_line_file"
+(test ! -f ${GFS_TGT}) \
+  && at_fn_check_skip 77 "$at_srcdir/mkfs.at:181"
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:182: \$GFS_MKFS -p lock_nolock -j2 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -j2 $GFS_TGT" "mkfs.at:182"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -j2 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:182"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/mkfs.at:183: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "mkfs.at:183"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/mkfs.at:183"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+  set +x
+  $at_times_p && times >"$at_times_file"
+) 5>&1 2>&1 7>&- | eval $at_tee_pipe
+read at_status <"$at_status_file"
+#AT_STOP_23
+#AT_START_24
+at_fn_group_banner 24 'fsck.at:4' \
+  "Conflicting options" "                            " 2
+at_xfail=no
+(
+  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $at_traceon
+
+
 # Error code 16 is FSCK_USAGE
 { set +x
 $as_echo "$at_srcdir/fsck.at:7: fsck.gfs2 -y -n \$GFS_TGT"
@@ -3932,13 +4025,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_23
-#AT_START_24
-at_fn_group_banner 24 'fsck.at:15' \
+#AT_STOP_24
+#AT_START_25
+at_fn_group_banner 25 'fsck.at:15' \
   "Fix invalid block sizes" "                        " 2
 at_xfail=no
 (
-  $as_echo "24. $at_setup_line: testing $at_desc ..."
+  $as_echo "25. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4286,13 +4379,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_24
-#AT_START_25
-at_fn_group_banner 25 'fsck.at:24' \
+#AT_STOP_25
+#AT_START_26
+at_fn_group_banner 26 'fsck.at:24' \
   "Fix invalid goal blocks" "                        " 2
 at_xfail=no
 (
-  $as_echo "25. $at_setup_line: testing $at_desc ..."
+  $as_echo "26. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4368,13 +4461,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_25
-#AT_START_26
-at_fn_group_banner 26 'fsck.at:29' \
+#AT_STOP_26
+#AT_START_27
+at_fn_group_banner 27 'fsck.at:29' \
   "Fix bad resource group #0" "                      " 2
 at_xfail=no
 (
-  $as_echo "26. $at_setup_line: testing $at_desc ..."
+  $as_echo "27. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4450,13 +4543,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_26
-#AT_START_27
-at_fn_group_banner 27 'fsck.at:34' \
+#AT_STOP_27
+#AT_START_28
+at_fn_group_banner 28 'fsck.at:34' \
   "Fix bad resource group #1" "                      " 2
 at_xfail=no
 (
-  $as_echo "27. $at_setup_line: testing $at_desc ..."
+  $as_echo "28. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4532,13 +4625,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_27
-#AT_START_28
-at_fn_group_banner 28 'fsck.at:44' \
+#AT_STOP_28
+#AT_START_29
+at_fn_group_banner 29 'fsck.at:44' \
   "Fix bad rindex entry #1" "                        " 2
 at_xfail=no
 (
-  $as_echo "28. $at_setup_line: testing $at_desc ..."
+  $as_echo "29. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4614,13 +4707,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_28
-#AT_START_29
-at_fn_group_banner 29 'fsck.at:49' \
+#AT_STOP_29
+#AT_START_30
+at_fn_group_banner 30 'fsck.at:49' \
   "Rebuild bad journal" "                            " 2
 at_xfail=no
 (
-  $as_echo "29. $at_setup_line: testing $at_desc ..."
+  $as_echo "30. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4696,13 +4789,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_29
-#AT_START_30
-at_fn_group_banner 30 'fsck.at:58' \
+#AT_STOP_30
+#AT_START_31
+at_fn_group_banner 31 'fsck.at:58' \
   "gfs2 format versions" "                           " 2
 at_xfail=no
 (
-  $as_echo "30. $at_setup_line: testing $at_desc ..."
+  $as_echo "31. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4736,9 +4829,9 @@ $at_failed && at_fn_log_failure
 $at_traceon; }
 
 { set +x
-$as_echo "$at_srcdir/fsck.at:62: echo \"set sb { sb_fs_format: 1802 }\" | gfs2l \${GFS_TGT}; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
+$as_echo "$at_srcdir/fsck.at:62: echo \"set sb { sb_fs_format: 1803 }\" | gfs2l \${GFS_TGT}; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
 at_fn_check_prepare_notrace 'a ${...} parameter expansion' "fsck.at:62"
-( $at_check_trace; echo "set sb { sb_fs_format: 1802 }" | gfs2l ${GFS_TGT}; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+( $at_check_trace; echo "set sb { sb_fs_format: 1803 }" | gfs2l ${GFS_TGT}; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
@@ -4800,19 +4893,45 @@ echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
 at_fn_check_status 0 $at_status "$at_srcdir/fsck.at:68"
 $at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/fsck.at:69: mkfs.gfs2 -O -p lock_nolock -o format=1802 \${GFS_TGT}"
+at_fn_check_prepare_notrace 'a ${...} parameter expansion' "fsck.at:69"
+( $at_check_trace; mkfs.gfs2 -O -p lock_nolock -o format=1802 ${GFS_TGT}
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/fsck.at:69"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/fsck.at:70: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "fsck.at:70"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/fsck.at:70"
+$at_failed && at_fn_log_failure
 $at_traceon; }
 
   set +x
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_30
-#AT_START_31
-at_fn_group_banner 31 'edit.at:4' \
+#AT_STOP_31
+#AT_START_32
+at_fn_group_banner 32 'edit.at:4' \
   "Save/restoremeta, defaults" "                     " 3
 at_xfail=no
 (
-  $as_echo "31. $at_setup_line: testing $at_desc ..."
+  $as_echo "32. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -4920,13 +5039,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_31
-#AT_START_32
-at_fn_group_banner 32 'edit.at:17' \
+#AT_STOP_32
+#AT_START_33
+at_fn_group_banner 33 'edit.at:17' \
   "Save/restoremeta, no compression" "               " 3
 at_xfail=no
 (
-  $as_echo "32. $at_setup_line: testing $at_desc ..."
+  $as_echo "33. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -5018,13 +5137,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_32
-#AT_START_33
-at_fn_group_banner 33 'edit.at:27' \
+#AT_STOP_33
+#AT_START_34
+at_fn_group_banner 34 'edit.at:27' \
   "Save/restoremeta, min. block size" "              " 3
 at_xfail=no
 (
-  $as_echo "33. $at_setup_line: testing $at_desc ..."
+  $as_echo "34. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -5116,13 +5235,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_33
-#AT_START_34
-at_fn_group_banner 34 'edit.at:37' \
+#AT_STOP_34
+#AT_START_35
+at_fn_group_banner 35 'edit.at:37' \
   "Save/restoremeta, 4 journals" "                   " 3
 at_xfail=no
 (
-  $as_echo "34. $at_setup_line: testing $at_desc ..."
+  $as_echo "35. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -5214,13 +5333,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_34
-#AT_START_35
-at_fn_group_banner 35 'edit.at:47' \
+#AT_STOP_35
+#AT_START_36
+at_fn_group_banner 36 'edit.at:47' \
   "Save/restoremeta, min. block size, 4 journals" "  " 3
 at_xfail=no
 (
-  $as_echo "35. $at_setup_line: testing $at_desc ..."
+  $as_echo "36. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -5312,13 +5431,13 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_35
-#AT_START_36
-at_fn_group_banner 36 'edit.at:57' \
+#AT_STOP_36
+#AT_START_37
+at_fn_group_banner 37 'edit.at:57' \
   "Save metadata to /dev/null" "                     " 3
 at_xfail=no
 (
-  $as_echo "36. $at_setup_line: testing $at_desc ..."
+  $as_echo "37. $at_setup_line: testing $at_desc ..."
   $at_traceon
 
 
@@ -5381,50 +5500,10 @@ $at_traceon; }
   $at_times_p && times >"$at_times_file"
 ) 5>&1 2>&1 7>&- | eval $at_tee_pipe
 read at_status <"$at_status_file"
-#AT_STOP_36
-#AT_START_37
-at_fn_group_banner 37 'libgfs2.at:3' \
-  "meta.c" "                                         " 4
-at_xfail=no
-(
-  $as_echo "37. $at_setup_line: testing $at_desc ..."
-  $at_traceon
-
-
-{ set +x
-$as_echo "$at_srcdir/libgfs2.at:3: test x\"\$ENABLE_UNIT_TESTS\" = \"xyes\" || exit 77"
-at_fn_check_prepare_dynamic "test x\"$ENABLE_UNIT_TESTS\" = \"xyes\" || exit 77" "libgfs2.at:3"
-( $at_check_trace; test x"$ENABLE_UNIT_TESTS" = "xyes" || exit 77
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/libgfs2.at:3"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/libgfs2.at:4: check_meta; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "check_meta; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "libgfs2.at:4"
-( $at_check_trace; check_meta; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-echo stderr:; cat "$at_stderr"
-echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/libgfs2.at:4"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-  set +x
-  $at_times_p && times >"$at_times_file"
-) 5>&1 2>&1 7>&- | eval $at_tee_pipe
-read at_status <"$at_status_file"
 #AT_STOP_37
 #AT_START_38
-at_fn_group_banner 38 'libgfs2.at:7' \
-  "rgrp.c" "                                         " 4
+at_fn_group_banner 38 'tune.at:4' \
+  "Format version" "                                 " 4
 at_xfail=no
 (
   $as_echo "38. $at_setup_line: testing $at_desc ..."
@@ -5432,28 +5511,97 @@ at_xfail=no
 
 
 { set +x
-$as_echo "$at_srcdir/libgfs2.at:7: test x\"\$ENABLE_UNIT_TESTS\" = \"xyes\" || exit 77"
-at_fn_check_prepare_dynamic "test x\"$ENABLE_UNIT_TESTS\" = \"xyes\" || exit 77" "libgfs2.at:7"
-( $at_check_trace; test x"$ENABLE_UNIT_TESTS" = "xyes" || exit 77
-) >>"$at_stdout" 2>>"$at_stderr" 5>&-
-at_status=$? at_failed=false
-$at_check_filter
-at_fn_diff_devnull "$at_stderr" || at_failed=:
-at_fn_diff_devnull "$at_stdout" || at_failed=:
-at_fn_check_status 0 $at_status "$at_srcdir/libgfs2.at:7"
-$at_failed && at_fn_log_failure
-$at_traceon; }
-
-{ set +x
-$as_echo "$at_srcdir/libgfs2.at:8: check_rgrp; x=\$?; if test \$x -eq 127; then exit 77; else exit \$x; fi"
-at_fn_check_prepare_dynamic "check_rgrp; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi" "libgfs2.at:8"
-( $at_check_trace; check_rgrp; x=$?; if test $x -eq 127; then exit 77; else exit $x; fi
+$as_echo "$at_srcdir/tune.at:6: \$GFS_MKFS -p lock_nolock -o format=1802 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=1802 $GFS_TGT" "tune.at:6"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=1802 $GFS_TGT
 ) >>"$at_stdout" 2>>"$at_stderr" 5>&-
 at_status=$? at_failed=false
 $at_check_filter
 echo stderr:; cat "$at_stderr"
 echo stdout:; cat "$at_stdout"
-at_fn_check_status 0 $at_status "$at_srcdir/libgfs2.at:8"
+at_fn_check_status 0 $at_status "$at_srcdir/tune.at:6"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+# Exit code 65 == EX_DATAERR (sysexits.h)
+{ set +x
+$as_echo "$at_srcdir/tune.at:8: tunegfs2 -r 0 \$GFS_TGT"
+at_fn_check_prepare_dynamic "tunegfs2 -r 0 $GFS_TGT" "tune.at:8"
+( $at_check_trace; tunegfs2 -r 0 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 65 $at_status "$at_srcdir/tune.at:8"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+# Regress not supported
+{ set +x
+$as_echo "$at_srcdir/tune.at:10: tunegfs2 -r 1801 \$GFS_TGT"
+at_fn_check_prepare_dynamic "tunegfs2 -r 1801 $GFS_TGT" "tune.at:10"
+( $at_check_trace; tunegfs2 -r 1801 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 65 $at_status "$at_srcdir/tune.at:10"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+# Format 1803 does not exist
+{ set +x
+$as_echo "$at_srcdir/tune.at:12: tunegfs2 -r 1803 \$GFS_TGT"
+at_fn_check_prepare_dynamic "tunegfs2 -r 1803 $GFS_TGT" "tune.at:12"
+( $at_check_trace; tunegfs2 -r 1803 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 65 $at_status "$at_srcdir/tune.at:12"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+# Normal version bump
+{ set +x
+$as_echo "$at_srcdir/tune.at:14: \$GFS_MKFS -p lock_nolock -o format=1801 \$GFS_TGT"
+at_fn_check_prepare_dynamic "$GFS_MKFS -p lock_nolock -o format=1801 $GFS_TGT" "tune.at:14"
+( $at_check_trace; $GFS_MKFS -p lock_nolock -o format=1801 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/tune.at:14"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/tune.at:15: tunegfs2 -r 1802 \$GFS_TGT"
+at_fn_check_prepare_dynamic "tunegfs2 -r 1802 $GFS_TGT" "tune.at:15"
+( $at_check_trace; tunegfs2 -r 1802 $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/tune.at:15"
+$at_failed && at_fn_log_failure
+$at_traceon; }
+
+{ set +x
+$as_echo "$at_srcdir/tune.at:16: fsck.gfs2 -n \$GFS_TGT"
+at_fn_check_prepare_dynamic "fsck.gfs2 -n $GFS_TGT" "tune.at:16"
+( $at_check_trace; fsck.gfs2 -n $GFS_TGT
+) >>"$at_stdout" 2>>"$at_stderr" 5>&-
+at_status=$? at_failed=false
+$at_check_filter
+echo stderr:; cat "$at_stderr"
+echo stdout:; cat "$at_stdout"
+at_fn_check_status 0 $at_status "$at_srcdir/tune.at:16"
 $at_failed && at_fn_log_failure
 $at_traceon; }