From f0844f330876cde005a1e39f3b1e090b6e459dd7 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Mon, 8 Mar 2021 16:33:08 +0000
Subject: [PATCH 01/21] * Mon Mar 08 2021 Andrew Price <anprice@redhat.com> -
 3.4.0-1 - New upstream version - Update testsuite script

---
 .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; }
 

From 10ee050aa6083acdc0193bbadd149d609c880989 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Mon, 8 Mar 2021 16:33:08 +0000
Subject: [PATCH 02/21] * Mon Mar 08 2021 Andrew Price <anprice@redhat.com> -
 3.4.0-1 - New upstream version - Update testsuite script

---
 .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; }
 

From a074a7436dea5e323060c78a562136f33b0c82c5 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Mon, 15 Mar 2021 10:41:35 +0000
Subject: [PATCH 03/21] * Mon Mar 15 2021 Andrew Price <anprice@redhat.com> -
 3.4.1-1 - New upstream version

---
 .gitignore      | 1 +
 gfs2-utils.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index facb12a..2daf545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gfs2-utils-3.3.0.tar.gz
 /gfs2-utils-3.4.0.tar.gz
+/gfs2-utils-3.4.1.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 8616ac3..3b7c2cc 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,5 +1,5 @@
 Name: gfs2-utils
-Version: 3.4.0
+Version: 3.4.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
@@ -63,6 +63,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
+- New upstream version
+
 * Mon Mar 08 2021 Andrew Price <anprice@redhat.com> - 3.4.0-1
 - New upstream version
 - Update testsuite script
diff --git a/sources b/sources
index f879e91..b779448 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.4.0.tar.gz) = 01d3f582705a5dc9ee9919d3cd5798118233797f1400a7d2387a2e5072cdc347c6d5c8140aa242c0d00a2b26f31ae19386938f22761c76b3dbfb7a71f97c7420
+SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e

From f7fc3f1c3b16f819350184003bae0db51b650252 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Mon, 15 Mar 2021 10:41:35 +0000
Subject: [PATCH 04/21] * Mon Mar 15 2021 Andrew Price <anprice@redhat.com> -
 3.4.1-1 - New upstream version

---
 .gitignore      | 1 +
 gfs2-utils.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index facb12a..2daf545 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /gfs2-utils-3.3.0.tar.gz
 /gfs2-utils-3.4.0.tar.gz
+/gfs2-utils-3.4.1.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 8616ac3..3b7c2cc 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,5 +1,5 @@
 Name: gfs2-utils
-Version: 3.4.0
+Version: 3.4.1
 Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
@@ -63,6 +63,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
+- New upstream version
+
 * Mon Mar 08 2021 Andrew Price <anprice@redhat.com> - 3.4.0-1
 - New upstream version
 - Update testsuite script
diff --git a/sources b/sources
index f879e91..b779448 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.4.0.tar.gz) = 01d3f582705a5dc9ee9919d3cd5798118233797f1400a7d2387a2e5072cdc347c6d5c8140aa242c0d00a2b26f31ae19386938f22761c76b3dbfb7a71f97c7420
+SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e

From c1bedfabfa631a72a6ab8c83b82354c2cdc5df6d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 22 Jul 2021 00:10:11 +0000
Subject: [PATCH 05/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 3b7c2cc..43f955e 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -63,6 +63,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
 - New upstream version
 

From fa034e844952390a11a9ceeeeeabddb5e1420c19 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Wed, 3 Nov 2021 15:57:58 +0000
Subject: [PATCH 06/21] * Wed Nov 03 2021 Andrew Price <anprice@redhat.com> -
 3.4.1-2 - Rebuild against latest kernel-headers - Enables support for fs
 format 1802

---
 gfs2-utils.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 3b7c2cc..f2cd484 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.4.1
-Release: 1%{?dist}
+Release: 2%{?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
+* Wed Nov 03 2021 Andrew Price <anprice@redhat.com> - 3.4.1-2
+- Rebuild against latest kernel-headers
+- Enables creating fs format 1802.
+
 * Mon Mar 15 2021 Andrew Price <anprice@redhat.com> - 3.4.1-1
 - New upstream version
 

From 009a3940f3987324440465ec08666c4d87480629 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 20 Jan 2022 04:21:55 +0000
Subject: [PATCH 07/21] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 43f955e..e79c924 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -63,6 +63,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 56e8974ead862577d526a9e17918d3de3957b8ec Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Thu, 23 Jun 2022 15:41:47 +0100
Subject: [PATCH 08/21] * Thu Jun 23 2022 Andrew Price <anprice@redhat.com> -
 3.4.1-4 - gfs2/edit: always use "%s"-style format for printf()-style
 functions - Custom patch to fix a printw() call missed by the above   Fixes a
 build failure due to format-security warnings being treated as errors

---
 ...le_format_for_printf_style_functions.patch | 33 +++++++++++++++++++
 1-fix-missed-printw.patch                     | 12 +++++++
 gfs2-utils.spec                               |  9 ++++-
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
 create mode 100644 1-fix-missed-printw.patch

diff --git a/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch b/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
new file mode 100644
index 0000000..1c5d7d7
--- /dev/null
+++ b/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
@@ -0,0 +1,33 @@
+commit 17fb470356a6d55988f05ac70f06b382ef982604
+Author: Sergei Trofimovich <slyich@gmail.com>
+Date:   Sun Nov 7 09:00:31 2021 +0000
+
+    gfs2/edit: always use "%s"-style format for printf()-style functions
+    
+    `ncurses-6.3` added printf-style function attributes and now makes
+    it easier to catch cases when user input is used in place of format
+    string when built with CFLAGS=-Werror=format-security:
+    
+        hexedit.c:227:9: error: format not a string literal and no format arguments [-Werror=format-security]
+          227 |         printw(s2);
+              |         ^~~~~~
+    
+    Let's wrap all the missing places with "%s" format.
+
+diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
+index 798639b5..88ee3e5f 100644
+--- a/gfs2/edit/hexedit.c
++++ b/gfs2/edit/hexedit.c
+@@ -221,10 +221,10 @@ static void gfs2instr(const char *s1, const char *s2)
+ {
+ 	COLORS_HIGHLIGHT;
+ 	move(line,0);
+-	printw(s1);
++	printw("%s", s1);
+ 	COLORS_NORMAL;
+ 	move(line,17);
+-	printw(s2);
++	printw("%s", s2);
+ 	line++;
+ }
+ 
diff --git a/1-fix-missed-printw.patch b/1-fix-missed-printw.patch
new file mode 100644
index 0000000..be4c2d7
--- /dev/null
+++ b/1-fix-missed-printw.patch
@@ -0,0 +1,12 @@
+diff -urN gfs2-utils-3.4.1.old/gfs2/edit/gfs2hex.c gfs2-utils-3.4.1/gfs2/edit/gfs2hex.c
+--- gfs2-utils-3.4.1.old/gfs2/edit/gfs2hex.c	2022-06-23 15:28:41.957428587 +0100
++++ gfs2-utils-3.4.1/gfs2/edit/gfs2hex.c	2022-06-23 15:29:38.013944443 +0100
+@@ -374,7 +374,7 @@
+ 	if (termlines) {
+ 		check_highlight(TRUE);
+ 		move(line,2);
+-		printw(title);
++		printw("%s", title);
+ 		check_highlight(FALSE);
+ 	}
+ 	else
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index e79c924..d0bcb5c 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.4.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -21,6 +21,8 @@ BuildRequires: bzip2-devel
 BuildRequires: make
 Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
+Patch: 0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
+Patch: 1-fix-missed-printw.patch
 
 %prep
 %autosetup -p1
@@ -63,6 +65,11 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jun 23 2022 Andrew Price <anprice@redhat.com> - 3.4.1-4
+- gfs2/edit: always use "%s"-style format for printf()-style functions
+- Custom patch to fix a printw() call missed by the above
+  Fixes a build failure due to format-security warnings being treated as errors
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From 05ff9d3929e95a73b5d9437badaeb747b6e62999 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 21 Jul 2022 04:32:13 +0000
Subject: [PATCH 09/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index d0bcb5c..d387ad7 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.4.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -65,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Thu Jun 23 2022 Andrew Price <anprice@redhat.com> - 3.4.1-4
 - gfs2/edit: always use "%s"-style format for printf()-style functions
 - Custom patch to fix a printw() call missed by the above

From 5af69c86ff0a4781a669d6435f993749fe836366 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 19 Jan 2023 04:47:19 +0000
Subject: [PATCH 10/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index d387ad7..d70129c 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.4.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2+ and LGPLv2+
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
@@ -65,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 1e1999af85f70a41f427c790668ed8eb34583378 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Thu, 9 Feb 2023 16:32:20 +0000
Subject: [PATCH 11/21] * Thu Feb 09 2023 Andrew Price <anprice@redhat.com> -
 3.5.0-1 - New upstream release - Drop all patches - Exclude i686 for
 https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval - Migrate to
 SPDX license identifier

---
 .gitignore                                    |  1 +
 ...le_format_for_printf_style_functions.patch | 33 -------------------
 1-fix-missed-printw.patch                     | 12 -------
 gfs2-utils.spec                               | 17 +++++++---
 sources                                       |  2 +-
 5 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
 delete mode 100644 1-fix-missed-printw.patch

diff --git a/.gitignore b/.gitignore
index 2daf545..e258909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /gfs2-utils-3.3.0.tar.gz
 /gfs2-utils-3.4.0.tar.gz
 /gfs2-utils-3.4.1.tar.gz
+/gfs2-utils-3.5.0.tar.gz
diff --git a/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch b/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
deleted file mode 100644
index 1c5d7d7..0000000
--- a/0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 17fb470356a6d55988f05ac70f06b382ef982604
-Author: Sergei Trofimovich <slyich@gmail.com>
-Date:   Sun Nov 7 09:00:31 2021 +0000
-
-    gfs2/edit: always use "%s"-style format for printf()-style functions
-    
-    `ncurses-6.3` added printf-style function attributes and now makes
-    it easier to catch cases when user input is used in place of format
-    string when built with CFLAGS=-Werror=format-security:
-    
-        hexedit.c:227:9: error: format not a string literal and no format arguments [-Werror=format-security]
-          227 |         printw(s2);
-              |         ^~~~~~
-    
-    Let's wrap all the missing places with "%s" format.
-
-diff --git a/gfs2/edit/hexedit.c b/gfs2/edit/hexedit.c
-index 798639b5..88ee3e5f 100644
---- a/gfs2/edit/hexedit.c
-+++ b/gfs2/edit/hexedit.c
-@@ -221,10 +221,10 @@ static void gfs2instr(const char *s1, const char *s2)
- {
- 	COLORS_HIGHLIGHT;
- 	move(line,0);
--	printw(s1);
-+	printw("%s", s1);
- 	COLORS_NORMAL;
- 	move(line,17);
--	printw(s2);
-+	printw("%s", s2);
- 	line++;
- }
- 
diff --git a/1-fix-missed-printw.patch b/1-fix-missed-printw.patch
deleted file mode 100644
index be4c2d7..0000000
--- a/1-fix-missed-printw.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN gfs2-utils-3.4.1.old/gfs2/edit/gfs2hex.c gfs2-utils-3.4.1/gfs2/edit/gfs2hex.c
---- gfs2-utils-3.4.1.old/gfs2/edit/gfs2hex.c	2022-06-23 15:28:41.957428587 +0100
-+++ gfs2-utils-3.4.1/gfs2/edit/gfs2hex.c	2022-06-23 15:29:38.013944443 +0100
-@@ -374,7 +374,7 @@
- 	if (termlines) {
- 		check_highlight(TRUE);
- 		move(line,2);
--		printw(title);
-+		printw("%s", title);
- 		check_highlight(FALSE);
- 	}
- 	else
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index d70129c..586bcae 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,11 +1,14 @@
 Name: gfs2-utils
-Version: 3.4.1
-Release: 6%{?dist}
-License: GPLv2+ and LGPLv2+
+Version: 3.5.0
+Release: 1%{?dist}
+# Refer to doc/README.licence in the upstream tarball
+License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
 %ifnarch %{arm}
 %{?fedora:Recommends: kmod(gfs2.ko) kmod(dlm.ko)}
 %endif
+# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+ExcludeArch: %{ix86}
 BuildRequires: ncurses-devel
 BuildRequires: kernel-headers
 BuildRequires: automake
@@ -21,8 +24,6 @@ BuildRequires: bzip2-devel
 BuildRequires: make
 Source: https://releases.pagure.org/gfs2-utils/gfs2-utils-%{version}.tar.gz
 URL: https://pagure.io/gfs2-utils
-Patch: 0-gfs2_edit_always_use_s_style_format_for_printf_style_functions.patch
-Patch: 1-fix-missed-printw.patch
 
 %prep
 %autosetup -p1
@@ -65,6 +66,12 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Feb 09 2023 Andrew Price <anprice@redhat.com> - 3.5.0-1
+- New upstream release
+- Drop all patches
+- Exclude i686 for https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
+- Migrate to SPDX license identifier
+
 * Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index b779448..310735a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.4.1.tar.gz) = 998c6d15e2f4b00ffffe18b8ab84f3ae11daf7ba4d10bc4e5d602ecc370b8f4de2fe44af4d7b9926785d4a39680139a9ae8a66d6863ff19b1a60fd999a60495e
+SHA512 (gfs2-utils-3.5.0.tar.gz) = 9fb47bab0b082b4379ea0ccb5066a95a9dfb5912cde9ca950b7771a4699ecf3df1f99ebd709893866eaffa77f7d8894f6fadef423df79e3f7563d8f94d137765

From c378aa91c68f5dd977cd17499bfa2372c9ec3e43 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Tue, 11 Apr 2023 18:37:03 +0100
Subject: [PATCH 12/21] * Tue Apr 11 2023 Andrew Price <anprice@redhat.com> -
 3.5.1-1 - New upstream release

---
 .gitignore      | 1 +
 gfs2-utils.spec | 5 ++++-
 sources         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e258909..0c329f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /gfs2-utils-3.4.0.tar.gz
 /gfs2-utils-3.4.1.tar.gz
 /gfs2-utils-3.5.0.tar.gz
+/gfs2-utils-3.5.1.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 586bcae..e95949b 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,5 +1,5 @@
 Name: gfs2-utils
-Version: 3.5.0
+Version: 3.5.1
 Release: 1%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Tue Apr 11 2023 Andrew Price <anprice@redhat.com> - 3.5.1-1
+- New upstream release
+
 * Thu Feb 09 2023 Andrew Price <anprice@redhat.com> - 3.5.0-1
 - New upstream release
 - Drop all patches
diff --git a/sources b/sources
index 310735a..4278534 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.5.0.tar.gz) = 9fb47bab0b082b4379ea0ccb5066a95a9dfb5912cde9ca950b7771a4699ecf3df1f99ebd709893866eaffa77f7d8894f6fadef423df79e3f7563d8f94d137765
+SHA512 (gfs2-utils-3.5.1.tar.gz) = 08c7b1870b1fb76496f7ab4ce3c121e4e5f5a37760831536817ed880ef030d765a533c53ba9913ae080b4a98b4efaffa112fcf92acd4e939199d1dae8d0e6f9b

From 8a2056d72b6047abdb5a38ddc0cafd2528231df3 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 21:13:19 +0000
Subject: [PATCH 13/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index e95949b..75a2f4f 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.5.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Tue Apr 11 2023 Andrew Price <anprice@redhat.com> - 3.5.1-1
 - New upstream release
 

From 2a63457c456237db8a83f32d94d847296b9ed00c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 20:41:10 +0000
Subject: [PATCH 14/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 75a2f4f..5a3969b 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From e87fb43e6fdc0d47d8d596a0e563854008c34cb0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jan 2024 12:56:36 +0000
Subject: [PATCH 15/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 5a3969b..b64b2dc 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.5.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 5a9f1acadd7a7279e47c0b6cf9f4742bb46ccedc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 18 Jul 2024 00:35:26 +0000
Subject: [PATCH 16/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index b64b2dc..a8a7f45 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.5.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From 11929a37617d1c91789c8c47764c74797f2e4997 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 19:57:40 +0000
Subject: [PATCH 17/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index a8a7f45..845a3ff 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.5.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 9914a4c60a73ccffb857a41715c2bc513544baf3 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Mon, 20 Jan 2025 18:06:53 +0000
Subject: [PATCH 18/21] * Mon Jan 20 2025 Andrew Price <anprice@redhat.com> -
 3.5.1-7 - Don't hardcode /usr/sbin in the spec

---
 gfs2-utils.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 845a3ff..778e1d5 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.5.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -39,8 +39,8 @@ make check || { cat tests/testsuite.log; exit 1; }
 %install
 %make_install
 # Don't ship gfs2_{trace,lockcapture} in this package
-rm -f %{buildroot}/usr/sbin/gfs2_trace
-rm -f %{buildroot}/usr/sbin/gfs2_lockcapture
+rm -f %{buildroot}%{_sbindir}/gfs2_trace
+rm -f %{buildroot}%{_sbindir}/gfs2_lockcapture
 rm -f %{buildroot}%{_mandir}/man8/gfs2_trace.8
 rm -f %{buildroot}%{_mandir}/man8/gfs2_lockcapture.8
 
@@ -66,6 +66,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Mon Jan 20 2025 Andrew Price <anprice@redhat.com> - 3.5.1-7
+- Don't hardcode /usr/sbin in the spec
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 0d360ede59aafd48958f891bb7f5d79eb654b0d4 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Thu, 27 Feb 2025 17:13:30 +0000
Subject: [PATCH 19/21] * Thu Feb 27 2025 Andrew Price <anprice@redhat.com> -
 3.6.1-1 - New upstream release

---
 .gitignore      | 1 +
 gfs2-utils.spec | 8 +++++---
 sources         | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0c329f8..3076a6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /gfs2-utils-3.4.1.tar.gz
 /gfs2-utils-3.5.0.tar.gz
 /gfs2-utils-3.5.1.tar.gz
+/gfs2-utils-3.6.1.tar.gz
diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 778e1d5..58beb29 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
-Version: 3.5.1
-Release: 7%{?dist}
+Version: 3.6.1
+Release: 1%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -55,7 +55,6 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_sbindir}/gfs2_grow
 %{_sbindir}/gfs2_jadd
 %{_sbindir}/mkfs.gfs2
-%{_sbindir}/gfs2_convert
 %{_sbindir}/gfs2_edit
 %{_sbindir}/tunegfs2
 %{_sbindir}/glocktop
@@ -66,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Thu Feb 27 2025 Andrew Price <anprice@redhat.com> - 3.6.1-1
+- New upstream release
+
 * Mon Jan 20 2025 Andrew Price <anprice@redhat.com> - 3.5.1-7
 - Don't hardcode /usr/sbin in the spec
 
diff --git a/sources b/sources
index 4278534..bf0a0ab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gfs2-utils-3.5.1.tar.gz) = 08c7b1870b1fb76496f7ab4ce3c121e4e5f5a37760831536817ed880ef030d765a533c53ba9913ae080b4a98b4efaffa112fcf92acd4e939199d1dae8d0e6f9b
+SHA512 (gfs2-utils-3.6.1.tar.gz) = c620cd7cac29af927a6325ffe024f3090285083f8a094935f318026e7fadb9b63cdbccc4962141ff93a2994fe32d138bf1ff999a58dfe268c034156132785346

From 940e1380316390487b89742392d76a7e43575db4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 21:20:59 +0000
Subject: [PATCH 20/21] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 gfs2-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gfs2-utils.spec b/gfs2-utils.spec
index 58beb29..3f1220a 100644
--- a/gfs2-utils.spec
+++ b/gfs2-utils.spec
@@ -1,6 +1,6 @@
 Name: gfs2-utils
 Version: 3.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 # Refer to doc/README.licence in the upstream tarball
 License: GPL-2.0-or-later AND LGPL-2.1-or-later
 Summary: Utilities for managing the global file system (GFS2)
@@ -65,6 +65,9 @@ modifying, and correcting inconsistencies in GFS2 file systems.
 %{_prefix}/lib/udev/rules.d/82-gfs2-withdraw.rules
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 3.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Thu Feb 27 2025 Andrew Price <anprice@redhat.com> - 3.6.1-1
 - New upstream release
 

From 1cd5e8054480bdecdc4a5d84de6661712e19d329 Mon Sep 17 00:00:00 2001
From: Andrew Price <anprice@redhat.com>
Date: Mon, 28 Jul 2025 11:21:17 +0100
Subject: [PATCH 21/21] Migrate tests to tmt

For https://fedoraproject.org/wiki/Changes/DisableSTI
---
 .fmf/version        |  1 +
 plans/testsuite.fmf |  5 +++++
 tests/tests.yml     | 11 -----------
 tests/testsuite.fmf |  2 ++
 4 files changed, 8 insertions(+), 11 deletions(-)
 create mode 100644 .fmf/version
 create mode 100644 plans/testsuite.fmf
 delete mode 100644 tests/tests.yml
 create mode 100644 tests/testsuite.fmf

diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/plans/testsuite.fmf b/plans/testsuite.fmf
new file mode 100644
index 0000000..2f86880
--- /dev/null
+++ b/plans/testsuite.fmf
@@ -0,0 +1,5 @@
+summary: Run testsuite
+discover:
+  how: fmf
+execute:
+  how: tmt
diff --git a/tests/tests.yml b/tests/tests.yml
deleted file mode 100644
index aaaac51..0000000
--- a/tests/tests.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- hosts: localhost
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-      environment:
-        PATH: ".:{{ ansible_env.PATH }}"
-      tests:
-        - upstream_test_suite:
-            dir: .
-            run: ./testsuite
diff --git a/tests/testsuite.fmf b/tests/testsuite.fmf
new file mode 100644
index 0000000..dd9714f
--- /dev/null
+++ b/tests/testsuite.fmf
@@ -0,0 +1,2 @@
+summary: Upstream testsuite
+test: ./testsuite