xfs: convert struct typedefs in xfs_ondisk.h

Replace xfs_foo_t with struct xfs_foo where appropriate.  The next patch
will import more checks from xfs/122, and it's easier to automate
deduplication if we don't have to reason about typedefs.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/fs/xfs/libxfs/xfs_ondisk.h b/fs/xfs/libxfs/xfs_ondisk.h
index 99eae7f67e961ba466098ed2ab285a8973dcb9a9..98208c8a0d9ed0be9766347e5bca2f4524cc8ed0 100644 (file)
--- a/fs/xfs/libxfs/xfs_ondisk.h
+++ b/fs/xfs/libxfs/xfs_ondisk.h
@@ -49,7 +49,7 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_timestamp,      8);
        XFS_CHECK_STRUCT_SIZE(xfs_alloc_key_t,                  8);
        XFS_CHECK_STRUCT_SIZE(xfs_alloc_ptr_t,                  4);
-       XFS_CHECK_STRUCT_SIZE(xfs_alloc_rec_t,                  8);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec,             8);
        XFS_CHECK_STRUCT_SIZE(xfs_inobt_ptr_t,                  4);
        XFS_CHECK_STRUCT_SIZE(xfs_refcount_ptr_t,               4);
        XFS_CHECK_STRUCT_SIZE(xfs_rmap_ptr_t,                   4);
@@ -68,10 +68,10 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_free_hdr,         64);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf,             64);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf_hdr,         64);
-       XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_entry_t,            8);
-       XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_hdr_t,              32);
-       XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_map_t,              4);
-       XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_local_t,       4);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_entry,               8);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_hdr,         32);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_map,         4);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_local,  4);
 
        /* realtime structures */
        XFS_CHECK_STRUCT_SIZE(union xfs_rtword_raw,             4);
@@ -79,23 +79,23 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_rtbuf_blkinfo,         48);
 
        /*
-        * m68k has problems with xfs_attr_leaf_name_remote_t, but we pad it to
-        * 4 bytes anyway so it's not obviously a problem.  Hence for the moment
-        * we don't check this structure. This can be re-instated when the attr
-        * definitions are updated to use c99 VLA definitions.
+        * m68k has problems with struct xfs_attr_leaf_name_remote, but we pad
+        * it to 4 bytes anyway so it's not obviously a problem.  Hence for the
+        * moment we don't check this structure. This can be re-instated when
+        * the attr definitions are updated to use c99 VLA definitions.
         *
-       XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_remote_t,      12);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_remote, 12);
         */
 
        XFS_CHECK_OFFSET(struct xfs_dsb, sb_crc,                224);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, valuelen,  0);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, namelen,   2);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, nameval,   3);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, valueblk, 0);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, valuelen, 4);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, namelen,  8);
-       XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, name,     9);
-       XFS_CHECK_STRUCT_SIZE(xfs_attr_leafblock_t,             32);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_local, valuelen,     0);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_local, namelen,      2);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_local, nameval,      3);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, valueblk,    0);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, valuelen,    4);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, namelen,     8);
+       XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, name,        9);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leafblock,                32);
        XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_hdr,           4);
        XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, totsize,       0);
        XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, count,         2);
@@ -103,25 +103,25 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, valuelen,    1);
        XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, flags,       2);
        XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, nameval,     3);
-       XFS_CHECK_STRUCT_SIZE(xfs_da_blkinfo_t,                 12);
-       XFS_CHECK_STRUCT_SIZE(xfs_da_intnode_t,                 16);
-       XFS_CHECK_STRUCT_SIZE(xfs_da_node_entry_t,              8);
-       XFS_CHECK_STRUCT_SIZE(xfs_da_node_hdr_t,                16);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_free_t,             4);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_hdr_t,              16);
-       XFS_CHECK_OFFSET(xfs_dir2_data_unused_t, freetag,       0);
-       XFS_CHECK_OFFSET(xfs_dir2_data_unused_t, length,        2);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_hdr_t,              16);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_t,                  16);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_entry_t,            8);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_hdr_t,              16);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_t,                  16);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_tail_t,             4);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_entry_t,              3);
-       XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, namelen,          0);
-       XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, offset,           1);
-       XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, name,             3);
-       XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_hdr_t,                10);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_da_blkinfo,            12);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_da_intnode,            16);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_entry,         8);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_hdr,           16);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free,                4);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_hdr,         16);
+       XFS_CHECK_OFFSET(struct xfs_dir2_data_unused, freetag,  0);
+       XFS_CHECK_OFFSET(struct xfs_dir2_data_unused, length,   2);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free_hdr,         16);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free,             16);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_entry,       8);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_hdr,         16);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf,             16);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_tail,        4);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_entry,         3);
+       XFS_CHECK_OFFSET(struct xfs_dir2_sf_entry, namelen,     0);
+       XFS_CHECK_OFFSET(struct xfs_dir2_sf_entry, offset,      1);
+       XFS_CHECK_OFFSET(struct xfs_dir2_sf_entry, name,        3);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_hdr,           10);
        XFS_CHECK_STRUCT_SIZE(struct xfs_parent_rec,            12);
 
        /* log structures */