From aea1b4e4c7ab5d4b9234fd065b2db8f4be75e034 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 27 Jul 2007 14:23:44 +0100 Subject: [PATCH] --- yaml --- r: 63109 b: refs/heads/master c: 2d954d06acbcf9a5f7668a1897850c9b7be6b8f3 h: refs/heads/master i: 63107: e7cb4fb8474e76a18b1558d1dcf06c1ee9022d38 v: v3 --- [refs] | 2 +- trunk/include/linux/reiserfs_fs.h | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 45a786748aab..c060f5f66e2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 986c76036adb0b12cbe1bf1ce1f75586585ee227 +refs/heads/master: 2d954d06acbcf9a5f7668a1897850c9b7be6b8f3 diff --git a/trunk/include/linux/reiserfs_fs.h b/trunk/include/linux/reiserfs_fs.h index 965d5b3ea9eb..180a9d832dde 100644 --- a/trunk/include/linux/reiserfs_fs.h +++ b/trunk/include/linux/reiserfs_fs.h @@ -81,14 +81,16 @@ void reiserfs_warning(struct super_block *s, const char *fmt, ...); /* assertions handling */ /** always check a condition and panic if it's false. */ -#define RASSERT( cond, format, args... ) \ +#define __RASSERT( cond, scond, format, args... ) \ if( !( cond ) ) \ - reiserfs_panic( NULL, "reiserfs[%i]: assertion " #cond " failed at " \ + reiserfs_panic( NULL, "reiserfs[%i]: assertion " scond " failed at " \ __FILE__ ":%i:%s: " format "\n", \ in_interrupt() ? -1 : current -> pid, __LINE__ , __FUNCTION__ , ##args ) +#define RASSERT(cond, format, args...) __RASSERT(cond, #cond, format, ##args) + #if defined( CONFIG_REISERFS_CHECK ) -#define RFALSE( cond, format, args... ) RASSERT( !( cond ), format, ##args ) +#define RFALSE(cond, format, args...) __RASSERT(!(cond), "!(" #cond ")", format, ##args) #else #define RFALSE( cond, format, args... ) do {;} while( 0 ) #endif