summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs
diff options
context:
space:
mode:
authorNicolas Iooss <nicolas.iooss_linux@m4x.org>2015-03-17 16:15:35 +0100
committerJan Kara <jack@suse.cz>2015-03-17 16:15:35 +0100
commit5ce1aca814354c5942cdb5604e142a49be7033eb (patch)
treee9931adea4fc3d1e967922733b16a383c80ffb5e /fs/reiserfs
parent7dca0548a21e5efa445b68a73554ef863e09c623 (diff)
downloadlinux-stable-5ce1aca814354c5942cdb5604e142a49be7033eb.tar.gz
linux-stable-5ce1aca814354c5942cdb5604e142a49be7033eb.tar.bz2
linux-stable-5ce1aca814354c5942cdb5604e142a49be7033eb.zip
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 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>
Diffstat (limited to 'fs/reiserfs')
-rw-r--r--fs/reiserfs/reiserfs.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/reiserfs/reiserfs.h b/fs/reiserfs/reiserfs.h
index bb79cddf0a1f..2adcde137c3f 100644
--- a/fs/reiserfs/reiserfs.h
+++ b/fs/reiserfs/reiserfs.h
@@ -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)