From 0727599739afc266f87f880e8f60c60e033a11da Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 21 Jun 2005 15:43:22 +1000 Subject: [PATCH] --- yaml --- r: 2619 b: refs/heads/master c: d130c14c0310edac5ea0c6327bef7e3715f9a083 h: refs/heads/master i: 2617: e4356a5069596e8129c768e966d688d1533c758e 2615: 550fbbe0fb33fbf116df94a2eda04f5cb1827aab v: v3 --- [refs] | 2 +- trunk/fs/xfs/support/debug.c | 1 - trunk/fs/xfs/support/debug.h | 7 +------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 139cd318880c..98e7767c3492 100644 --- 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 index 7d6e1f37df10..4ed7b6928cd7 100644 --- a/trunk/fs/xfs/support/debug.c +++ b/trunk/fs/xfs/support/debug.c @@ -36,7 +36,6 @@ #include #include -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 index 40b0f4c54d9e..c5b9365a7e2a 100644 --- 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);