From: Christoph Hellwig <hch@infradead.org>
Date: Mon, 10 Oct 2011 18:21:56 +0000 (+0000)
Subject: fix 122 for recent xfsprogs
X-Git-Tag: v1.1.0~7
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a64bf4cd24d06ae198eb6a64f0a01f07129f0c6c;p=users%2Fhch%2Fxfstests-dev.git

fix 122 for recent xfsprogs

- filter out xfs_alloctype_t, this was an internal emum that got removed
 - filter out xfs_bmbt_rec_32_t, this is a variant of the xfs_bmbt_rec_t
   that had almost no users and was removed
 - filter out xfs_dinode_core_t, the separate dinode core is gone, and just
   checking the size of the full dinode is enough
 - accept xfs_bmbt_rec_t as the new canonical name for xfs_bmbt_rec_64_t,
   and replace the old name with the new one in the output stream.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>
---

diff --git a/122 b/122
index 5f1e10c04..a57f8c32a 100755
--- a/122
+++ b/122
@@ -57,6 +57,12 @@ s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = <SIZE>/;
 	fi
 }
 
+# filter out known changes to xfs type names
+_type_name_filter()
+{
+	sed -e 's/xfs_bmbt_rec_64_t/xfs_bmbt_rec_t/'
+}
+
 _attribute_filter()
 {
 	sed -e 's/__attribute__ *[(][(]packed[)][)]//' \
@@ -73,7 +79,9 @@ cat >$cprog <<EOF
 EOF
 
 cat >$tmp.ignore <<EOF
+xfs_alloctype_t
 xfs_buf_cancel_t
+xfs_bmbt_rec_32_t
 xfs_swapext_t
 xfs_dirops_t
 xfs_efi_log_item_t
@@ -160,6 +168,7 @@ xfs_log_item_chunk_t
 xfs_trans_t
 xfs_dirent_t
 xfs_fsop_getparents_handlereq_t
+xfs_dinode_core_t
 EOF
 
 echo 'int main(int argc, char *argv[]) {' >>$cprog
@@ -193,7 +202,7 @@ echo 'return 0; }' >>$cprog
 # create and run program
 cc -o $oprog $cprog >> $seq.full 2>&1 || \
   _notrun "Could not compile test program (see end of $seq.full)"
-$oprog | _type_size_filter > $progout
+$oprog | _type_size_filter | _type_name_filter > $progout
 
 #
 # add addition sizes and xfs_sb_t fields that don't exist in the version
diff --git a/122.out b/122.out
index 388ad1e87..c30e98829 100644
--- a/122.out
+++ b/122.out
@@ -50,7 +50,6 @@ sizeof( xfs_agfl_t ) = 4
 sizeof( xfs_agi_t ) = 296
 sizeof( xfs_alloc_rec_incore_t ) = 8
 sizeof( xfs_alloc_rec_t ) = 8
-sizeof( xfs_alloctype_t ) = 4
 sizeof( xfs_attr_inactive_list_t ) = 8
 sizeof( xfs_attr_leaf_entry_t ) = 8
 sizeof( xfs_attr_leaf_hdr_t ) = 32
@@ -61,14 +60,12 @@ sizeof( xfs_attr_leafblock_t ) = 56
 sizeof( xfs_attr_shortform_t ) = 8
 sizeof( xfs_attrlist_cursor_t ) = 16
 sizeof( xfs_bmbt_key_t ) = 8
-sizeof( xfs_bmbt_rec_32_t ) = 16
-sizeof( xfs_bmbt_rec_64_t ) = 16
+sizeof( xfs_bmbt_rec_t ) = 16
 sizeof( xfs_bmdr_block_t ) = 4
 sizeof( xfs_btnum_t ) = 4
 sizeof( xfs_buf_log_format_t ) = 24
 sizeof( xfs_da_blkinfo_t ) = 12
 sizeof( xfs_da_intnode_t ) = 24
-sizeof( xfs_dinode_core_t ) = 96
 sizeof( xfs_dinode_fmt_t ) = 4
 sizeof( xfs_dir2_data_free_t ) = 4
 sizeof( xfs_dir2_data_hdr_t ) = 16