---

yaml --- r: 2619 b: refs/heads/master c: d130c14 h: refs/heads/master i: 2617: e4356a5 2615: 550fbbe v: v3
git-mirror · Jun 21, 2005 · 0727599 · 0727599
1 parent 1f8c0c3
commit 0727599
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d795ca3442c7a562c45aeb7a7a808c79992a589
+refs/heads/master: d130c14c0310edac5ea0c6327bef7e3715f9a083
diff --git a/trunk/fs/xfs/support/debug.c b/trunk/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/trunk/fs/xfs/support/debug.h b/trunk/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);