diff --git a/122 b/122 index 5f1e10c0..a57f8c32 100755 --- a/122 +++ b/122 @@ -57,6 +57,12 @@ s/sizeof\( xfs_agf_t \) = 64/sizeof( xfs_agf_t ) = /; 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 <$tmp.ignore <>$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 388ad1e8..c30e9882 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