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>

diff --git a/fs/xfs/libxfs/xfs_ondisk.h b/fs/xfs/libxfs/xfs_ondisk.h
index 98208c8..7b7c3d6 100644 (file)
--- a/fs/xfs/libxfs/xfs_ondisk.h
+++ b/fs/xfs/libxfs/xfs_ondisk.h
@@ -22,38 +22,39 @@
 static inline void __init
 xfs_check_ondisk_structs(void)
 {
-       /* ag/file structures */
+       /* file structures */
        XFS_CHECK_STRUCT_SIZE(struct xfs_acl,                   4);
        XFS_CHECK_STRUCT_SIZE(struct xfs_acl_entry,             12);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_agf,                   224);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_agfl,                  36);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_agi,                   344);
        XFS_CHECK_STRUCT_SIZE(struct xfs_bmbt_key,              8);
        XFS_CHECK_STRUCT_SIZE(struct xfs_bmbt_rec,              16);
        XFS_CHECK_STRUCT_SIZE(struct xfs_bmdr_block,            4);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_shdr,      48);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_lhdr,      64);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block,           72);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dinode,                176);
        XFS_CHECK_STRUCT_SIZE(struct xfs_disk_dquot,            104);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dqblk,                 136);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dsb,                   288);
        XFS_CHECK_STRUCT_SIZE(struct xfs_dsymlink_hdr,          56);
+       XFS_CHECK_STRUCT_SIZE(xfs_timestamp_t,                  8);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_legacy_timestamp,      8);
+
+       /* space btrees */
+       XFS_CHECK_STRUCT_SIZE(struct xfs_agf,                   224);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_agfl,                  36);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_agi,                   344);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_alloc_rec,             8);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block,           72);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_lhdr,      64);
+       XFS_CHECK_STRUCT_SIZE(struct xfs_btree_block_shdr,      48);
        XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_key,             4);
        XFS_CHECK_STRUCT_SIZE(struct xfs_inobt_rec,             16);
        XFS_CHECK_STRUCT_SIZE(struct xfs_refcount_key,          4);
        XFS_CHECK_STRUCT_SIZE(struct xfs_refcount_rec,          12);
        XFS_CHECK_STRUCT_SIZE(struct xfs_rmap_key,              20);
        XFS_CHECK_STRUCT_SIZE(struct xfs_rmap_rec,              24);
-       XFS_CHECK_STRUCT_SIZE(xfs_timestamp_t,                  8);
-       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(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);
-       XFS_CHECK_STRUCT_SIZE(struct xfs_rtsb,                  56);
 
        /* dir/attr trees */
        XFS_CHECK_STRUCT_SIZE(struct xfs_attr3_leaf_hdr,        80);
@@ -74,6 +75,7 @@ xfs_check_ondisk_structs(void)
        XFS_CHECK_STRUCT_SIZE(struct xfs_attr_leaf_name_local,  4);
 
        /* realtime structures */
+       XFS_CHECK_STRUCT_SIZE(struct xfs_rtsb,                  56);
        XFS_CHECK_STRUCT_SIZE(union xfs_rtword_raw,             4);
        XFS_CHECK_STRUCT_SIZE(union xfs_suminfo_raw,            4);
        XFS_CHECK_STRUCT_SIZE(struct xfs_rtbuf_blkinfo,         48);