Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / fs / reiserfs / prints.c

diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index c0b1112ab7e3ad6b6f310172444ccf017ac09409..54944d5a4a6e170fb55f507e9373456226eb23db 100644 (file)
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -358,12 +358,13 @@ void __reiserfs_panic(struct super_block *sb, const char *id,
        dump_stack();
 #endif
        if (sb)
-               panic(KERN_WARNING "REISERFS panic (device %s): %s%s%s: %s\n",
+               printk(KERN_WARNING "REISERFS panic (device %s): %s%s%s: %s\n",
                      sb->s_id, id ? id : "", id ? " " : "",
                      function, error_buf);
        else
-               panic(KERN_WARNING "REISERFS panic: %s%s%s: %s\n",
+               printk(KERN_WARNING "REISERFS panic: %s%s%s: %s\n",
                      id ? id : "", id ? " " : "", function, error_buf);
+       BUG();
 }
 
 void __reiserfs_error(struct super_block *sb, const char *id,