[XFS] Cleanup maxrecs calculation.
Clean up the way the maximum and minimum records for the btree blocks are calculated. For the alloc and inobt btrees all the values are pre-calculated in xfs_mount_common, and we switch the current loop around the ugly generic macros that use cpp token pasting to generate type names to two small helpers in normal C code. For the bmbt and bmdr trees these helpers also exist, but can be called during runtime, too. Here we also kill various macros dealing with them and inline the logic into the get_minrecs / get_maxrecs / get_dmaxrecs methods in xfs_bmap_btree.c. Note that all these new helpers take an xfs_mount * argument which will be needed to determine the size of a btree block once we add support for extended btree blocks with CRCs and other RAS information. SGI-PV: 988146 SGI-Modid: xfs-linux-melb:xfs-kern:32292a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Donald Douwsma <donaldd@sgi.com> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
This commit is contained in:

committed by
Lachlan McIlroy

parent
5b4d89ae0f
commit
60197e8df3
@@ -276,12 +276,12 @@ typedef struct xfs_mount {
|
||||
uint m_blockmask; /* sb_blocksize-1 */
|
||||
uint m_blockwsize; /* sb_blocksize in words */
|
||||
uint m_blockwmask; /* blockwsize-1 */
|
||||
uint m_alloc_mxr[2]; /* XFS_ALLOC_BLOCK_MAXRECS */
|
||||
uint m_alloc_mnr[2]; /* XFS_ALLOC_BLOCK_MINRECS */
|
||||
uint m_bmap_dmxr[2]; /* XFS_BMAP_BLOCK_DMAXRECS */
|
||||
uint m_bmap_dmnr[2]; /* XFS_BMAP_BLOCK_DMINRECS */
|
||||
uint m_inobt_mxr[2]; /* XFS_INOBT_BLOCK_MAXRECS */
|
||||
uint m_inobt_mnr[2]; /* XFS_INOBT_BLOCK_MINRECS */
|
||||
uint m_alloc_mxr[2]; /* max alloc btree records */
|
||||
uint m_alloc_mnr[2]; /* min alloc btree records */
|
||||
uint m_bmap_dmxr[2]; /* max bmap btree records */
|
||||
uint m_bmap_dmnr[2]; /* min bmap btree records */
|
||||
uint m_inobt_mxr[2]; /* max inobt btree records */
|
||||
uint m_inobt_mnr[2]; /* min inobt btree records */
|
||||
uint m_ag_maxlevels; /* XFS_AG_MAXLEVELS */
|
||||
uint m_bm_maxlevels[2]; /* XFS_BM_MAXLEVELS */
|
||||
uint m_in_maxlevels; /* XFS_IN_MAXLEVELS */
|
||||
|
Reference in New Issue
Block a user