Skip to content

Commit 89b3828

Browse files
author
Darrick J. Wong
committed
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>
1 parent ea079ef commit 89b3828

1 file changed

Lines changed: 37 additions & 37 deletions

File tree

‎fs/xfs/libxfs/xfs_ondisk.h‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ xfs_check_ondisk_structs(void)
4949
XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_timestamp, 8);
5050
XFS_CHECK_STRUCT_SIZE(xfs_alloc_key_t, 8);
5151
XFS_CHECK_STRUCT_SIZE(xfs_alloc_ptr_t, 4);
52-
XFS_CHECK_STRUCT_SIZE(xfs_alloc_rec_t, 8);
52+
XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec, 8);
5353
XFS_CHECK_STRUCT_SIZE(xfs_inobt_ptr_t, 4);
5454
XFS_CHECK_STRUCT_SIZE(xfs_refcount_ptr_t, 4);
5555
XFS_CHECK_STRUCT_SIZE(xfs_rmap_ptr_t, 4);
@@ -68,60 +68,60 @@ xfs_check_ondisk_structs(void)
6868
XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_free_hdr, 64);
6969
XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf, 64);
7070
XFS_CHECK_STRUCT_SIZE(struct xfs_dir3_leaf_hdr, 64);
71-
XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_entry_t, 8);
72-
XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_hdr_t, 32);
73-
XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_map_t, 4);
74-
XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_local_t, 4);
71+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_entry, 8);
72+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_hdr, 32);
73+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_map, 4);
74+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_local, 4);
7575

7676
/* realtime structures */
7777
XFS_CHECK_STRUCT_SIZE(union xfs_rtword_raw, 4);
7878
XFS_CHECK_STRUCT_SIZE(union xfs_suminfo_raw, 4);
7979
XFS_CHECK_STRUCT_SIZE(struct xfs_rtbuf_blkinfo, 48);
8080

8181
/*
82-
* m68k has problems with xfs_attr_leaf_name_remote_t, but we pad it to
83-
* 4 bytes anyway so it's not obviously a problem. Hence for the moment
84-
* we don't check this structure. This can be re-instated when the attr
85-
* definitions are updated to use c99 VLA definitions.
82+
* m68k has problems with struct xfs_attr_leaf_name_remote, but we pad
83+
* it to 4 bytes anyway so it's not obviously a problem. Hence for the
84+
* moment we don't check this structure. This can be re-instated when
85+
* the attr definitions are updated to use c99 VLA definitions.
8686
*
87-
XFS_CHECK_STRUCT_SIZE(xfs_attr_leaf_name_remote_t, 12);
87+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_remote, 12);
8888
*/
8989

9090
XFS_CHECK_OFFSET(struct xfs_dsb, sb_crc, 224);
91-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, valuelen, 0);
92-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, namelen, 2);
93-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_local_t, nameval, 3);
94-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, valueblk, 0);
95-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, valuelen, 4);
96-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, namelen, 8);
97-
XFS_CHECK_OFFSET(xfs_attr_leaf_name_remote_t, name, 9);
98-
XFS_CHECK_STRUCT_SIZE(xfs_attr_leafblock_t, 32);
91+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_local, valuelen, 0);
92+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_local, namelen, 2);
93+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_local, nameval, 3);
94+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, valueblk, 0);
95+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, valuelen, 4);
96+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, namelen, 8);
97+
XFS_CHECK_OFFSET(struct xfs_attr_leaf_name_remote, name, 9);
98+
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leafblock, 32);
9999
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_sf_hdr, 4);
100100
XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, totsize, 0);
101101
XFS_CHECK_OFFSET(struct xfs_attr_sf_hdr, count, 2);
102102
XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, namelen, 0);
103103
XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, valuelen, 1);
104104
XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, flags, 2);
105105
XFS_CHECK_OFFSET(struct xfs_attr_sf_entry, nameval, 3);
106-
XFS_CHECK_STRUCT_SIZE(xfs_da_blkinfo_t, 12);
107-
XFS_CHECK_STRUCT_SIZE(xfs_da_intnode_t, 16);
108-
XFS_CHECK_STRUCT_SIZE(xfs_da_node_entry_t, 8);
109-
XFS_CHECK_STRUCT_SIZE(xfs_da_node_hdr_t, 16);
110-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_free_t, 4);
111-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_data_hdr_t, 16);
112-
XFS_CHECK_OFFSET(xfs_dir2_data_unused_t, freetag, 0);
113-
XFS_CHECK_OFFSET(xfs_dir2_data_unused_t, length, 2);
114-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_hdr_t, 16);
115-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_free_t, 16);
116-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_entry_t, 8);
117-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_hdr_t, 16);
118-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_t, 16);
119-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_leaf_tail_t, 4);
120-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_entry_t, 3);
121-
XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, namelen, 0);
122-
XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, offset, 1);
123-
XFS_CHECK_OFFSET(xfs_dir2_sf_entry_t, name, 3);
124-
XFS_CHECK_STRUCT_SIZE(xfs_dir2_sf_hdr_t, 10);
106+
XFS_CHECK_STRUCT_SIZE(struct xfs_da_blkinfo, 12);
107+
XFS_CHECK_STRUCT_SIZE(struct xfs_da_intnode, 16);
108+
XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_entry, 8);
109+
XFS_CHECK_STRUCT_SIZE(struct xfs_da_node_hdr, 16);
110+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_free, 4);
111+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_data_hdr, 16);
112+
XFS_CHECK_OFFSET(struct xfs_dir2_data_unused, freetag, 0);
113+
XFS_CHECK_OFFSET(struct xfs_dir2_data_unused, length, 2);
114+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free_hdr, 16);
115+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_free, 16);
116+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_entry, 8);
117+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_hdr, 16);
118+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf, 16);
119+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_leaf_tail, 4);
120+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_entry, 3);
121+
XFS_CHECK_OFFSET(struct xfs_dir2_sf_entry, namelen, 0);
122+
XFS_CHECK_OFFSET(struct xfs_dir2_sf_entry, offset, 1);
123+
XFS_CHECK_OFFSET(struct xfs_dir2_sf_entry, name, 3);
124+
XFS_CHECK_STRUCT_SIZE(struct xfs_dir2_sf_hdr, 10);
125125
XFS_CHECK_STRUCT_SIZE(struct xfs_parent_rec, 12);
126126

127127
/* log structures */

0 commit comments

Comments
 (0)