kill struct xfs_btree_hdr
PATCH 1/26 kill struct xfs_btree_hdr
This type is only embedded in struct xfs_btree_block and never used directly. By moving the fields directly into struct xfs_btree_block a lot of the macros for struct xfs_btree_sblock and struct xfs_btree_lblock can be used for struct xfs_btree_block too now which helps greatly with some of the migrations during implementing the generic btree code.
fs/xfs/xfs_btree.c +6 -6
@@ -62,13 +62,13 @@ xfs_btree_maxrecs(case XFS_BTNUM_BNO :case XFS_BTNUM_CNT :return (int )XFS_ALLOC_BLOCK_MAXRECS ( -be16_to_cpu (block->bb_h.bb_level), cur); +be16_to_cpu (block->bb_level), cur);case XFS_BTNUM_BMAP :return (int )XFS_BMAP_BLOCK_IMAXRECS ( -be16_to_cpu (block->bb_h.bb_level), cur); +be16_to_cpu (block->bb_level), cur);case XFS_BTNUM_INO :return (int )XFS_INOBT_BLOCK_MAXRECS ( -be16_to_cpu (block->bb_h.bb_level), cur); +be16_to_cpu (block->bb_level), cur);default :ASSERT (0 );return 0 ;
@@ -634,7 +634,7 @@ xfs_btree_firstrec(/* * It's empty, there is no such record. */ -if (!block->bb_h.bb_numrecs) +if (!block->bb_numrecs)return 0 ;/* * Set the ptr value to 1, that's the first record/key.
@@ -663,12 +663,12 @@ xfs_btree_lastrec(/* * It's empty, there is no such record. */ -if (!block->bb_h.bb_numrecs) +if (!block->bb_numrecs)return 0 ;/* * Set the ptr value to numrecs, that's the last record/key. */ - cur->bc_ptrs[level] =be16_to_cpu (block->bb_h.bb_numrecs); + cur->bc_ptrs[level] =be16_to_cpu (block->bb_numrecs);return 1 ; }
fs/xfs/xfs_btree.h +1 -6
@@ -63,15 +63,10 @@ typedef struct xfs_btree_lblock {/* * Combined header and structure, used by common code. */ -typedef struct xfs_btree_hdr -{ +typedef struct xfs_btree_block { __be32 bb_magic; /* magic number for block type */ __be16 bb_level; /* 0 is a leaf */ __be16 bb_numrecs; /* current # of data records */ -}xfs_btree_hdr_t ; - -typedef struct xfs_btree_block { - xfs_btree_hdr_t bb_h; /* header */ union { struct { __be32 bb_leftsib;
Quoted 5 lines · Christoph Hellwig
This type is only embedded in struct
xfs_btree_blockand never used directly. By moving the fields directly into structxfs_btree_blocka lot of the macros for structxfs_btree_sblockand structxfs_btree_lblockcan be used for structxfs_btree_blocktoo now which helps greatly with some of the migrations during implementing the generic btree code.
Looks fine.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]