diff options
| author | Christoph Hellwig <hch@infradead.org> | 2007-08-16 02:24:02 -0400 |
|---|---|---|
| committer | Tim Shimmin <tes@chook.melbourne.sgi.com> | 2007-10-15 02:26:31 -0400 |
| commit | e05596643d4bb5ab7d813d1ac5724178ca4c7134 (patch) | |
| tree | b398dd155daf8a08c7d70c079b7b975bfd97c455 /fs/xfs | |
| parent | 8cba43447e7a843cd446a73baa91fe686f01e565 (diff) | |
[XFS] cleanup defintions of BMBT_*BITLEN macros
The BMBT_*BITLEN are currently defined in a complicated way depending on
XFS_NATIVE_HOST. But if all the macros are expanded they (obviously)
expand to the same value for both cases.
This patch defines the macros in the most simple way and updates the
comment describing them to remove outdated bits.
SGI-PV: 968563
SGI-Modid: xfs-linux-melb:xfs-kern:29320a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Tim Shimmin <tes@sgi.com>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_bmap_btree.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/fs/xfs/xfs_bmap_btree.h b/fs/xfs/xfs_bmap_btree.h index 268289059022..92b08b0bd6c2 100644 --- a/fs/xfs/xfs_bmap_btree.h +++ b/fs/xfs/xfs_bmap_btree.h | |||
| @@ -35,45 +35,16 @@ typedef struct xfs_bmdr_block { | |||
| 35 | 35 | ||
| 36 | /* | 36 | /* |
| 37 | * Bmap btree record and extent descriptor. | 37 | * Bmap btree record and extent descriptor. |
| 38 | * For 32-bit kernels, | ||
| 39 | * l0:31 is an extent flag (value 1 indicates non-normal). | ||
| 40 | * l0:0-30 and l1:9-31 are startoff. | ||
| 41 | * l1:0-8, l2:0-31, and l3:21-31 are startblock. | ||
| 42 | * l3:0-20 are blockcount. | ||
| 43 | * For 64-bit kernels, | ||
| 44 | * l0:63 is an extent flag (value 1 indicates non-normal). | 38 | * l0:63 is an extent flag (value 1 indicates non-normal). |
| 45 | * l0:9-62 are startoff. | 39 | * l0:9-62 are startoff. |
| 46 | * l0:0-8 and l1:21-63 are startblock. | 40 | * l0:0-8 and l1:21-63 are startblock. |
| 47 | * l1:0-20 are blockcount. | 41 | * l1:0-20 are blockcount. |
| 48 | */ | 42 | */ |
| 49 | |||
| 50 | #ifndef XFS_NATIVE_HOST | ||
| 51 | |||
| 52 | #define BMBT_TOTAL_BITLEN 128 /* 128 bits, 16 bytes */ | ||
| 53 | #define BMBT_EXNTFLAG_BITOFF 0 | ||
| 54 | #define BMBT_EXNTFLAG_BITLEN 1 | 43 | #define BMBT_EXNTFLAG_BITLEN 1 |
| 55 | #define BMBT_STARTOFF_BITOFF (BMBT_EXNTFLAG_BITOFF + BMBT_EXNTFLAG_BITLEN) | ||
| 56 | #define BMBT_STARTOFF_BITLEN 54 | 44 | #define BMBT_STARTOFF_BITLEN 54 |
| 57 | #define BMBT_STARTBLOCK_BITOFF (BMBT_STARTOFF_BITOFF + BMBT_STARTOFF_BITLEN) | ||
| 58 | #define BMBT_STARTBLOCK_BITLEN 52 | 45 | #define BMBT_STARTBLOCK_BITLEN 52 |
| 59 | #define BMBT_BLOCKCOUNT_BITOFF \ | ||
| 60 | (BMBT_STARTBLOCK_BITOFF + BMBT_STARTBLOCK_BITLEN) | ||
| 61 | #define BMBT_BLOCKCOUNT_BITLEN (BMBT_TOTAL_BITLEN - BMBT_BLOCKCOUNT_BITOFF) | ||
| 62 | |||
| 63 | #else | ||
| 64 | |||
| 65 | #define BMBT_TOTAL_BITLEN 128 /* 128 bits, 16 bytes */ | ||
| 66 | #define BMBT_EXNTFLAG_BITOFF 63 | ||
| 67 | #define BMBT_EXNTFLAG_BITLEN 1 | ||
| 68 | #define BMBT_STARTOFF_BITOFF (BMBT_EXNTFLAG_BITOFF - BMBT_STARTOFF_BITLEN) | ||
| 69 | #define BMBT_STARTOFF_BITLEN 54 | ||
| 70 | #define BMBT_STARTBLOCK_BITOFF 85 /* 128 - 43 (other 9 is in first word) */ | ||
| 71 | #define BMBT_STARTBLOCK_BITLEN 52 | ||
| 72 | #define BMBT_BLOCKCOUNT_BITOFF 64 /* Start of second 64 bit container */ | ||
| 73 | #define BMBT_BLOCKCOUNT_BITLEN 21 | 46 | #define BMBT_BLOCKCOUNT_BITLEN 21 |
| 74 | 47 | ||
| 75 | #endif /* XFS_NATIVE_HOST */ | ||
| 76 | |||
| 77 | 48 | ||
| 78 | #define BMBT_USE_64 1 | 49 | #define BMBT_USE_64 1 |
| 79 | 50 | ||