[PATCH 1/6] fix up btree headers for userspace

[Christoph Hellwig <hch@xxxxxx>]

Remove two __KERNEL__ sections in xfs_bmap_btree.h and xfs_btree.h that
prevent using the new generic btree code in xfsprogs.


Signed-off-by: Christoph Hellwig <hch@xxxxxx>

--- linux-2.6-xfs/fs/xfs/xfs_bmap_btree.h       2008-08-31 23:17:27.000000000 
-0300
+++ linux-2.6-xfs/fs/xfs/xfs_bmap_btree.h       2008-08-31 23:17:57.000000000 
-0300
@@ -231,8 +231,6 @@ typedef struct xfs_btree_lblock xfs_bmbt
         be16_to_cpu((bb)->bb_numrecs) <= (mp)->m_bmap_dmxr[(level) != 0])
 
 
-#ifdef __KERNEL__
-
 /*
  * Prototypes for xfs_bmap.c to call.
  */
@@ -264,6 +262,5 @@ extern void xfs_bmbt_to_bmdr(xfs_bmbt_bl
 extern struct xfs_btree_cur *xfs_bmbt_init_cursor(struct xfs_mount *,
                struct xfs_trans *, struct xfs_inode *, int);
 
-#endif /* __KERNEL__ */
 
 #endif /* __XFS_BMAP_BTREE_H__ */
--- linux-2.6-xfs/fs/xfs/xfs_btree.h    2008-08-31 23:12:32.000000000 -0300
+++ linux-2.6-xfs/fs/xfs/xfs_btree.h    2008-08-31 23:12:46.000000000 -0300
@@ -327,8 +327,6 @@ typedef struct xfs_btree_cur
 #define        XFS_BUF_TO_SBLOCK(bp)   ((xfs_btree_sblock_t *)XFS_BUF_PTR(bp))
 
 
-#ifdef __KERNEL__
-
 /*
  * Check that long form block header is ok.
  */
@@ -515,8 +513,6 @@ static inline int xfs_btree_get_level(st
        return be16_to_cpu(block->bb_level);
 }
 
-#endif /* __KERNEL__ */
-
 
 /*
  * Min and max functions for extlen, agblock, fileoff, and filblks types.

--