Commit 5ce1aca8 authored Mar 17, 2015 by Nicolas Iooss Committed by Jan Kara Mar 17, 2015

reiserfs: fix __RASSERT format string



__RASSERT format string does not use the PID argument.  reiserfs_panic
arguments are therefore formatted with the wrong format specifier (for
example __LINE__ with %s).  This bug was introduced when commit
c3a9c210 ("reiserfs: rework reiserfs_panic") removed a
"reiserfs[%i]" prefix.

This bug is only triggered when using CONFIG_REISERFS_CHECK, otherwise
__RASSERT is never used.

Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
Acked-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>

parent 7dca0548

fs/reiserfs/reiserfs.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -910,7 +910,6 @@ do { \
		if (!(cond)) \
		reiserfs_panic(NULL, "assertion failure", "(" #cond ") at " \
		__FILE__ ":%i:%s: " format "\n", \
		in_interrupt() ? -1 : task_pid_nr(current), \
		__LINE__, __func__ , ##args); \
		} while (0)

Admin message