summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_btree.h
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-10-30 08:53:47 +0300
committerLachlan McIlroy <lachlan@sgi.com>2008-10-30 08:53:47 +0300
commitf2277f06e626d694e61bb356524ff536ced24acf (patch)
treef5ada4a7fb6e9c98f340fdd83bcec3f5d41f95c5 /fs/xfs/xfs_btree.h
parentf338f9036400e453ab553b16639a9cc838b02d44 (diff)
downloadlinux-f2277f06e626d694e61bb356524ff536ced24acf.tar.xz
[XFS] 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. SGI-PV: 985583 SGI-Modid: xfs-linux-melb:xfs-kern:32174a Signed-off-by: Christoph Hellwig <hch@infradead.org> Signed-off-by: Lachlan McIlroy <lachlan@sgi.com> Signed-off-by: Bill O'Donnell <billodo@sgi.com> Signed-off-by: David Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs/xfs_btree.h')
-rw-r--r--fs/xfs/xfs_btree.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/xfs/xfs_btree.h b/fs/xfs/xfs_btree.h
index 1f528a2a3754..332b9f1da203 100644
--- a/fs/xfs/xfs_btree.h
+++ b/fs/xfs/xfs_btree.h
@@ -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;