diff options
| author | Christoph Hellwig <hch@sgi.com> | 2005-06-21 15:43:22 +1000 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2005-06-21 15:43:22 +1000 |
| commit | d130c14c0310edac5ea0c6327bef7e3715f9a083 (patch) | |
| tree | 994ae017609f34e6af8e2ba6f432ed3d65ed13ce /fs/xfs/support | |
| parent | 7d795ca3442c7a562c45aeb7a7a808c79992a589 (diff) | |
| download | linux-d130c14c0310edac5ea0c6327bef7e3715f9a083.tar.bz2 | |
[XFS] simplify ASSERT
SGI-PV: 938063
SGI-Modid: xfs-linux:xfs-kern:194416a
Signed-off-by: Christoph Hellwig <hch@sgi.com>
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs/xfs/support')
| -rw-r--r-- | fs/xfs/support/debug.c | 1 | ||||
| -rw-r--r-- | fs/xfs/support/debug.h | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/fs/xfs/support/debug.c b/fs/xfs/support/debug.c index 7d6e1f37df10..4ed7b6928cd7 100644 --- a/fs/xfs/support/debug.c +++ b/fs/xfs/support/debug.c @@ -36,7 +36,6 @@ #include <linux/sched.h> #include <linux/kernel.h> -int doass = 1; static char message[256]; /* keep it off the stack */ static DEFINE_SPINLOCK(xfs_err_lock); diff --git a/fs/xfs/support/debug.h b/fs/xfs/support/debug.h index 40b0f4c54d9e..c5b9365a7e2a 100644 --- a/fs/xfs/support/debug.h +++ b/fs/xfs/support/debug.h @@ -50,16 +50,11 @@ extern void cmn_err(int, char *, ...); #endif #ifdef DEBUG -# ifdef lint -# define ASSERT(EX) ((void)0) /* avoid "constant in conditional" babble */ -# else -# define ASSERT(EX) ((!doass||(EX))?((void)0):assfail(#EX, __FILE__, __LINE__)) -# endif /* lint */ +# define ASSERT(EX) ((EX) ? ((void)0) : assfail(#EX, __FILE__, __LINE__)) #else # define ASSERT(x) ((void)0) #endif -extern int doass; /* dynamically turn off asserts */ extern void assfail(char *, char *, int); #ifdef DEBUG extern unsigned long random(void); |