public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/6] fix up btree headers for userspace
@ 2008-09-22 11:06 Christoph Hellwig
  0 siblings, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2008-09-22 11:06 UTC (permalink / raw)
  To: xfs

[-- Attachment #1: xfs-btree-header-fixes --]
[-- Type: text/plain, Size: 1342 bytes --]

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@lst.de>

--- 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.

-- 

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH 1/6] fix up btree headers for userspace
@ 2008-09-15  0:46 Christoph Hellwig
  2008-09-16  5:12 ` Dave Chinner
  0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2008-09-15  0:46 UTC (permalink / raw)
  To: xfs

[-- Attachment #1: xfs-btree-header-fixes --]
[-- Type: text/plain, Size: 1342 bytes --]

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@lst.de>

--- 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.

-- 

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-09-22 11:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-22 11:06 [PATCH 1/6] fix up btree headers for userspace Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2008-09-15  0:46 Christoph Hellwig
2008-09-16  5:12 ` Dave Chinner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox