Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b49a0c18 authored Aug 12, 2013 by Dave Chinner Committed by Ben Myers Aug 12, 2013

xfs: remove KERNEL from debug code



There is no reason the remaining kernel-only debug code needs to
remain kernel-only. Kill the __KERNEL__ part of the defines, and let
userspace handle the debug code appropriately.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Mark Tinguely <tinguely@sgi.com>
Signed-off-by: Ben Myers <bpm@sgi.com>

parent 63d20d6e

fs/xfs/xfs_bmap.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -127,7 +127,7 @@ static inline void xfs_bmap_init(xfs_bmap_free_t flp, xfs_fsblock_t fbp)
	{ BMAP_RIGHT_FILLING, "RF" }, \		{ BMAP_RIGHT_FILLING, "RF" }, \
	{ BMAP_ATTRFORK, "ATTR" }		{ BMAP_ATTRFORK, "ATTR" }

	#if defined(__KERNEL) && defined(DEBUG)		#ifdef DEBUG
	void xfs_bmap_trace_exlist(struct xfs_inode *ip, xfs_extnum_t cnt,		void xfs_bmap_trace_exlist(struct xfs_inode *ip, xfs_extnum_t cnt,
	int whichfork, unsigned long caller_ip);		int whichfork, unsigned long caller_ip);
	#define XFS_BMAP_TRACE_EXLIST(ip,c,w) \		#define XFS_BMAP_TRACE_EXLIST(ip,c,w) \

fs/xfs/xfs_dir2_data.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -331,7 +331,7 @@ xfs_dir2_data_freefind(
	xfs_dir2_data_free_t dfp; / bestfree entry */		xfs_dir2_data_free_t dfp; / bestfree entry */
	xfs_dir2_data_aoff_t off; /* offset value needed */		xfs_dir2_data_aoff_t off; /* offset value needed */
	struct xfs_dir2_data_free *bf;		struct xfs_dir2_data_free *bf;
	#if defined(DEBUG) && defined(__KERNEL__)		#ifdef DEBUG
	int matched; /* matched the value */		int matched; /* matched the value */
	int seenzero; /* saw a 0 bestfree entry */		int seenzero; /* saw a 0 bestfree entry */
	#endif		#endif
	@@ -339,7 +339,7 @@ xfs_dir2_data_freefind(
	off = (xfs_dir2_data_aoff_t)((char )dup - (char )hdr);		off = (xfs_dir2_data_aoff_t)((char )dup - (char )hdr);
	bf = xfs_dir3_data_bestfree_p(hdr);		bf = xfs_dir3_data_bestfree_p(hdr);

	#if defined(DEBUG) && defined(__KERNEL__)		#ifdef DEBUG
	/*		/*
	* Validate some consistency in the bestfree table.		* Validate some consistency in the bestfree table.
	* Check order, non-overlapping entries, and if we find the		* Check order, non-overlapping entries, and if we find the

fs/xfs/xfs_rtalloc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2147,7 +2147,7 @@ xfs_rtfree_extent(
	ASSERT(mp->m_rbmip->i_itemp != NULL);		ASSERT(mp->m_rbmip->i_itemp != NULL);
	ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL));		ASSERT(xfs_isilocked(mp->m_rbmip, XFS_ILOCK_EXCL));

	#if defined(__KERNEL__) && defined(DEBUG)		#ifdef DEBUG
	/*		/*
	* Check to see that this whole range is currently allocated.		* Check to see that this whole range is currently allocated.
	*/		*/