Add support for sb_bad_features2 in QA 122

Merge of master-melb:xfs-cmds:31022a by kenmcd.

  Add support for sb_bad_features2 in superblock structure

diff --git a/122 b/122
index a5d9e8f30135dba15531712c7c3059b572b5578a..f193ae49a4e2dc56bf6db3bac1a331c999cc6437 100755 (executable)
--- a/122
+++ b/122
@@ -45,6 +45,7 @@ s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
 
 cprog=$tmp.get_structs.c
 oprog=$tmp.get_structs
+progout=$tmp.output
 
 cat >$cprog <<EOF
 #include <stdio.h>
@@ -160,6 +161,18 @@ echo 'return 0; }' >>$cprog
 
 # create and run program
 cc -o $oprog $cprog
-eval $oprog | LC_COLLATE=POSIX sort | _type_size_filter
+$oprog | _type_size_filter > $progout
+
+#
+# add addition sizes and xfs_sb_t fields that don't exist in the version
+# being tested.
+#
+
+# xfsprogs 2.9.8: sb_bad_features2 in pv 978822
+if [ $XFSPROGS_VERSION -lt 20908 ]; then
+       echo 'offsetof(xfs_sb_t, sb_bad_features2 ) = 204' >>$progout
+fi
+
+LC_COLLATE=POSIX sort $progout
 
 status=0

diff --git a/122.out b/122.out
index 5131f8a0d12dfc2b76f721b2cb633d883498c784..983160240d51e5c4b950b27deaa42eca9fceb2be 100644 (file)
--- a/122.out
+++ b/122.out
@@ -2,6 +2,7 @@ QA output created by 122
 offsetof(xfs_sb_t, sb_agblklog ) = 124
 offsetof(xfs_sb_t, sb_agblocks ) = 84
 offsetof(xfs_sb_t, sb_agcount ) = 88
+offsetof(xfs_sb_t, sb_bad_features2 ) = 204
 offsetof(xfs_sb_t, sb_blocklog ) = 120
 offsetof(xfs_sb_t, sb_blocksize ) = 4
 offsetof(xfs_sb_t, sb_dblocks ) = 8