Fix up QA for xfsprogs 2.9.x

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

  Golden output is slightly wrong for xfs_repair 2.9.2+

diff --git a/030.out.linux b/030.out.linux
index dd30f4e6a731639aa12ae07563d04d8ed707d1d9..5990901584baf438c6c158392dc91e0f146a8417 100644 (file)
--- a/030.out.linux
+++ b/030.out.linux
@@ -36,7 +36,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 Note - stripe unit (0) and width (0) fields have been reset.
@@ -67,7 +67,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 done
@@ -96,7 +96,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 done
@@ -119,7 +119,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 done
@@ -154,7 +154,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 Note - stripe unit (0) and width (0) fields have been reset.
@@ -189,7 +189,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 done
@@ -218,7 +218,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 done
@@ -245,7 +245,7 @@ Phase 5 - rebuild AG headers and trees...
 Phase 6 - check inode connectivity...
         - resetting contents of realtime bitmap and summary inodes
         - traversing filesystem ...
-        - traversals finished ...
+        - traversal finished ...
         - moving disconnected inodes to lost+found ...
 Phase 7 - verify and correct link counts...
 done

diff --git a/122 b/122
index a6787bb189e5401486a4b3d8e74471a22014e5f8..d49ed672105eaa6117655e3557b8408530c4b596 100755 (executable)
--- a/122
+++ b/122
@@ -119,6 +119,7 @@ xfs_inode_t
 xfs_inode_log_item_t
 xfs_log_iovec_t
 xfs_log_callback_t
+xfs_metablock_t
 xfs_mount_t
 xfs_sb_t
 xfs_log_item_t
@@ -151,9 +152,9 @@ cat /usr/include/xfs/xfs*.h | indent |\
 awk '
    /typedef struct xfs_sb/ { structon = 1; next }
    structon && $2 ~ /^sb_/ { sub(/[;,]/,"",$2)
-                             print "printf(\"offsetof(xfs_sb_t,", $2, ") = %d\\n\", offsetof(xfs_sb_t,", $2, "));"; next} 
+                             print "printf(\"offsetof(xfs_sb_t,", $2, ") = %d\\n\", offsetof(xfs_sb_t,", $2, "));"; next}
    structon && /}/ { structon = 0; next}
-'>>$cprog 
+'>>$cprog
 
 echo 'return 0; }' >>$cprog