From: Dave Chinner Date: Wed, 4 Sep 2013 22:05:41 +0000 (+0000) Subject: xfs: remove __KERNEL__ from debug code X-Git-Tag: v3.2.0-alpha1~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e2ecde404835e357203d0896a405df3f6bbc050;p=thirdparty%2Fxfsprogs-dev.git 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 Reviewed-by: Mark Tinguely Signed-off-by: Rich Johnston --- diff --git a/include/xfs_bmap.h b/include/xfs_bmap.h index 8b2fe9785..33b41f351 100644 --- a/include/xfs_bmap.h +++ b/include/xfs_bmap.h @@ -127,7 +127,7 @@ static inline void xfs_bmap_init(xfs_bmap_free_t *flp, xfs_fsblock_t *fbp) { BMAP_RIGHT_FILLING, "RF" }, \ { BMAP_ATTRFORK, "ATTR" } -#if defined(__KERNEL) && defined(DEBUG) +#ifdef DEBUG void xfs_bmap_trace_exlist(struct xfs_inode *ip, xfs_extnum_t cnt, int whichfork, unsigned long caller_ip); #define XFS_BMAP_TRACE_EXLIST(ip,c,w) \ diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c index 064ddb2b3..507487832 100644 --- a/libxfs/xfs_dir2_data.c +++ b/libxfs/xfs_dir2_data.c @@ -315,7 +315,7 @@ xfs_dir2_data_freefind( xfs_dir2_data_free_t *dfp; /* bestfree entry */ xfs_dir2_data_aoff_t off; /* offset value needed */ struct xfs_dir2_data_free *bf; -#if defined(DEBUG) && defined(__KERNEL__) +#ifdef DEBUG int matched; /* matched the value */ int seenzero; /* saw a 0 bestfree entry */ #endif @@ -323,7 +323,7 @@ xfs_dir2_data_freefind( off = (xfs_dir2_data_aoff_t)((char *)dup - (char *)hdr); bf = xfs_dir3_data_bestfree_p(hdr); -#if defined(DEBUG) && defined(__KERNEL__) +#ifdef DEBUG /* * Validate some consistency in the bestfree table. * Check order, non-overlapping entries, and if we find the diff --git a/libxfs/xfs_rtalloc.c b/libxfs/xfs_rtalloc.c index 9797db7fa..f5a90b2ad 100644 --- a/libxfs/xfs_rtalloc.c +++ b/libxfs/xfs_rtalloc.c @@ -735,7 +735,7 @@ xfs_rtfree_extent( ASSERT(mp->m_rbmip->i_itemp != NULL); 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. */