diff options
| author | Dave Chinner | 2011-03-07 00:09:35 +0100 |
|---|---|---|
| committer | Dave Chinner | 2011-03-07 00:09:35 +0100 |
| commit | 9130090b5f04f7e7bc29b944e0b1ba494fff3f98 (patch) | |
| tree | 54fafe352489be96c1796c022e431b97a5f48268 /fs/xfs/linux-2.6/xfs_linux.h | |
| parent | xfs: Convert remaining cmn_err() callers to new API (diff) | |
| download | kernel-qcow2-linux-9130090b5f04f7e7bc29b944e0b1ba494fff3f98.tar.gz kernel-qcow2-linux-9130090b5f04f7e7bc29b944e0b1ba494fff3f98.tar.xz kernel-qcow2-linux-9130090b5f04f7e7bc29b944e0b1ba494fff3f98.zip | |
xfs: kill support/debug.[ch]
The remaining functionality in debug.[ch] is effectively just assert
handling, conditional debug definitions and hex dumping. The hex
dumping and assert function can be moved into the new printk module,
while the rest can be moved into top-level header files. This allows
fs/xfs/support/debug.[ch] to be completely removed from the
codebase.
Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'fs/xfs/linux-2.6/xfs_linux.h')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_linux.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/fs/xfs/linux-2.6/xfs_linux.h b/fs/xfs/linux-2.6/xfs_linux.h index 1189bfcbcd3e..244be9cbfe78 100644 --- a/fs/xfs/linux-2.6/xfs_linux.h +++ b/fs/xfs/linux-2.6/xfs_linux.h @@ -39,7 +39,6 @@ #include <mrlock.h> #include <time.h> -#include <support/debug.h> #include <support/uuid.h> #include <linux/semaphore.h> @@ -281,4 +280,25 @@ static inline __uint64_t howmany_64(__uint64_t x, __uint32_t y) #define __arch_pack #endif +#define ASSERT_ALWAYS(expr) \ + (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + +#ifndef DEBUG +#define ASSERT(expr) ((void)0) + +#ifndef STATIC +# define STATIC static noinline +#endif + +#else /* DEBUG */ + +#define ASSERT(expr) \ + (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + +#ifndef STATIC +# define STATIC noinline +#endif + +#endif /* DEBUG */ + #endif /* __XFS_LINUX__ */ |