diff options
| author | Christoph Hellwig <hch@infradead.org> | 2008-10-30 02:11:40 -0400 |
|---|---|---|
| committer | Lachlan McIlroy <lachlan@sgi.com> | 2008-10-30 02:11:40 -0400 |
| commit | 136341b41ad4883bd668120f727a52c42331fe8a (patch) | |
| tree | 0cb1b220073948f2632911354a828606a9e276bb /fs/xfs/xfs_fsops.c | |
| parent | 6c7699c047c50403149ad91331dd39de47dea070 (diff) | |
[XFS] cleanup btree record / key / ptr addressing macros.
Replace the generic record / key / ptr addressing macros that use cpp
token pasting with simpler macros that do the job for just one given btree
type. The new macros lose the cur argument and thus can be used outside
the core btree code, but also gain an xfs_mount * argument to allow for
checking the CRC flag in the near future. Note that many of these macros
aren't actually used in the kernel code, but only in userspace (mostly in
xfs_repair).
SGI-PV: 988146
SGI-Modid: xfs-linux-melb:xfs-kern:32295a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Donald Douwsma <donaldd@sgi.com>
Signed-off-by: David Chinner <david@fromorbit.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs/xfs_fsops.c')
| -rw-r--r-- | fs/xfs/xfs_fsops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_fsops.c b/fs/xfs/xfs_fsops.c index 84583cf73db3..8ce72aba027f 100644 --- a/fs/xfs/xfs_fsops.c +++ b/fs/xfs/xfs_fsops.c | |||
| @@ -258,7 +258,7 @@ xfs_growfs_data_private( | |||
| 258 | block->bb_numrecs = cpu_to_be16(1); | 258 | block->bb_numrecs = cpu_to_be16(1); |
| 259 | block->bb_leftsib = cpu_to_be32(NULLAGBLOCK); | 259 | block->bb_leftsib = cpu_to_be32(NULLAGBLOCK); |
| 260 | block->bb_rightsib = cpu_to_be32(NULLAGBLOCK); | 260 | block->bb_rightsib = cpu_to_be32(NULLAGBLOCK); |
| 261 | arec = XFS_BTREE_REC_ADDR(xfs_alloc, block, 1); | 261 | arec = XFS_ALLOC_REC_ADDR(mp, block, 1); |
| 262 | arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp)); | 262 | arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp)); |
| 263 | arec->ar_blockcount = cpu_to_be32( | 263 | arec->ar_blockcount = cpu_to_be32( |
| 264 | agsize - be32_to_cpu(arec->ar_startblock)); | 264 | agsize - be32_to_cpu(arec->ar_startblock)); |
| @@ -279,7 +279,7 @@ xfs_growfs_data_private( | |||
| 279 | block->bb_numrecs = cpu_to_be16(1); | 279 | block->bb_numrecs = cpu_to_be16(1); |
| 280 | block->bb_leftsib = cpu_to_be32(NULLAGBLOCK); | 280 | block->bb_leftsib = cpu_to_be32(NULLAGBLOCK); |
| 281 | block->bb_rightsib = cpu_to_be32(NULLAGBLOCK); | 281 | block->bb_rightsib = cpu_to_be32(NULLAGBLOCK); |
| 282 | arec = XFS_BTREE_REC_ADDR(xfs_alloc, block, 1); | 282 | arec = XFS_ALLOC_REC_ADDR(mp, block, 1); |
| 283 | arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp)); | 283 | arec->ar_startblock = cpu_to_be32(XFS_PREALLOC_BLOCKS(mp)); |
| 284 | arec->ar_blockcount = cpu_to_be32( | 284 | arec->ar_blockcount = cpu_to_be32( |
| 285 | agsize - be32_to_cpu(arec->ar_startblock)); | 285 | agsize - be32_to_cpu(arec->ar_startblock)); |