From f21eb1af1190bfdd7c314d5f8e18ab65b15bdf9a Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Thu, 16 Aug 2007 15:38:08 +1000 Subject: [PATCH] --- yaml --- r: 64717 b: refs/heads/master c: ee5c80239d5f152d99f69165afbd115518353563 h: refs/heads/master i: 64715: c7495546f4a736aea06e99297782a8c3224948af v: v3 --- [refs] | 2 +- trunk/fs/xfs/support/debug.h | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 186f9a4fb892..3a4a82bace5e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34521c5e4971d01f6ef650fdee59e07be6c2c5e3 +refs/heads/master: ee5c80239d5f152d99f69165afbd115518353563 diff --git a/trunk/fs/xfs/support/debug.h b/trunk/fs/xfs/support/debug.h index a27a7c8c0526..855da0408647 100644 --- a/trunk/fs/xfs/support/debug.h +++ b/trunk/fs/xfs/support/debug.h @@ -34,10 +34,10 @@ extern void cmn_err(int, char *, ...) extern void assfail(char *expr, char *f, int l); #define ASSERT_ALWAYS(expr) \ - (unlikely((expr) != 0) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) + (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) #ifndef DEBUG -# define ASSERT(expr) ((void)0) +#define ASSERT(expr) ((void)0) #ifndef STATIC # define STATIC static noinline @@ -49,8 +49,10 @@ extern void assfail(char *expr, char *f, int l); #else /* DEBUG */ -# define ASSERT(expr) ASSERT_ALWAYS(expr) -# include +#include + +#define ASSERT(expr) \ + (unlikely(expr) ? (void)0 : assfail(#expr, __FILE__, __LINE__)) #ifndef STATIC # define STATIC noinline