reiserfs: fix __RASSERT format string
authorNicolas Iooss <nicolas.iooss_linux@m4x.org>
Tue, 17 Mar 2015 15:15:35 +0000 (16:15 +0100)
committerJan Kara <jack@suse.cz>
Tue, 17 Mar 2015 15:15:35 +0000 (16:15 +0100)
__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
c3a9c2109f84 ("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>
fs/reiserfs/reiserfs.h

index bb79cddf0a1f15691cb59252448ffd4a02ecad43..2adcde137c3fb8d569cddcdf83dfd443a11f693f 100644 (file)
@@ -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)