Skip to content

Commit 131a883

Browse files
author
Darrick J. Wong
committed
xfs: separate space btree structures in xfs_ondisk.h
Create a separate section for space management btrees so that they're not mixed in with file structures. Ignore the dsb stuff sprinkled around for now, because we'll deal with that in a subsequent patch. Signed-off-by: Darrick J. Wong <djwong@kernel.org> Reviewed-by: Christoph Hellwig <hch@lst.de>
1 parent 89b3828 commit 131a883

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

fs/xfs/libxfs/xfs_ondisk.h

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,38 +22,39 @@
2222
static inline void __init
2323
xfs_check_ondisk_structs(void)
2424
{
25-
/* ag/file structures */
25+
/* file structures */
2626
XFS_CHECK_STRUCT_SIZE(struct xfs_acl, 4);
2727
XFS_CHECK_STRUCT_SIZE(struct xfs_acl_entry, 12);
28-
XFS_CHECK_STRUCT_SIZE(struct xfs_agf, 224);
29-
XFS_CHECK_STRUCT_SIZE(struct xfs_agfl, 36);
30-
XFS_CHECK_STRUCT_SIZE(struct xfs_agi, 344);
3128
XFS_CHECK_STRUCT_SIZE(struct xfs_bmbt_key, 8);
3229
XFS_CHECK_STRUCT_SIZE(struct xfs_bmbt_rec, 16);
3330
XFS_CHECK_STRUCT_SIZE(struct xfs_bmdr_block, 4);
34-
XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_shdr, 48);
35-
XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_lhdr, 64);
36-
XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block, 72);
3731
XFS_CHECK_STRUCT_SIZE(struct xfs_dinode, 176);
3832
XFS_CHECK_STRUCT_SIZE(struct xfs_disk_dquot, 104);
3933
XFS_CHECK_STRUCT_SIZE(struct xfs_dqblk, 136);
4034
XFS_CHECK_STRUCT_SIZE(struct xfs_dsb, 288);
4135
XFS_CHECK_STRUCT_SIZE(struct xfs_dsymlink_hdr, 56);
36+
XFS_CHECK_STRUCT_SIZE(xfs_timestamp_t, 8);
37+
XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_timestamp, 8);
38+
39+
/* space btrees */
40+
XFS_CHECK_STRUCT_SIZE(struct xfs_agf, 224);
41+
XFS_CHECK_STRUCT_SIZE(struct xfs_agfl, 36);
42+
XFS_CHECK_STRUCT_SIZE(struct xfs_agi, 344);
43+
XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec, 8);
44+
XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block, 72);
45+
XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_lhdr, 64);
46+
XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_shdr, 48);
4247
XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_key, 4);
4348
XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_rec, 16);
4449
XFS_CHECK_STRUCT_SIZE(struct xfs_refcount_key, 4);
4550
XFS_CHECK_STRUCT_SIZE(struct xfs_refcount_rec, 12);
4651
XFS_CHECK_STRUCT_SIZE(struct xfs_rmap_key, 20);
4752
XFS_CHECK_STRUCT_SIZE(struct xfs_rmap_rec, 24);
48-
XFS_CHECK_STRUCT_SIZE(xfs_timestamp_t, 8);
49-
XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_timestamp, 8);
5053
XFS_CHECK_STRUCT_SIZE(xfs_alloc_key_t, 8);
5154
XFS_CHECK_STRUCT_SIZE(xfs_alloc_ptr_t, 4);
52-
XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec, 8);
5355
XFS_CHECK_STRUCT_SIZE(xfs_inobt_ptr_t, 4);
5456
XFS_CHECK_STRUCT_SIZE(xfs_refcount_ptr_t, 4);
5557
XFS_CHECK_STRUCT_SIZE(xfs_rmap_ptr_t, 4);
56-
XFS_CHECK_STRUCT_SIZE(struct xfs_rtsb, 56);
5758

5859
/* dir/attr trees */
5960
XFS_CHECK_STRUCT_SIZE(struct xfs_attr3_leaf_hdr, 80);
@@ -74,6 +75,7 @@ xfs_check_ondisk_structs(void)
7475
XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_local, 4);
7576

7677
/* realtime structures */
78+
XFS_CHECK_STRUCT_SIZE(struct xfs_rtsb, 56);
7779
XFS_CHECK_STRUCT_SIZE(union xfs_rtword_raw, 4);
7880
XFS_CHECK_STRUCT_SIZE(union xfs_suminfo_raw, 4);
7981
XFS_CHECK_STRUCT_SIZE(struct xfs_rtbuf_blkinfo, 48);

0 commit comments

Comments
 (0)