Skip to content

Commit

Permalink
fix preprocessor idiocy in reiserfs
Browse files Browse the repository at this point in the history
	#x blocks expansion of macro argument, but it won't do you any
good if it's already been expanded...  As it is, RFALSE(cond, ....)
ended up with stringified _expanded_ cond.  Real fun when cond contains
something like le32_to_cpu() and you are on a big-endian box...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Jul 29, 2007
1 parent 986c760 commit 2d954d0
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions include/linux/reiserfs_fs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 2d954d0

Please sign in to comment.