diff options
author | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
---|---|---|
committer | Jan Kara <jack@suse.cz> | 2013-08-09 10:49:58 +0200 |
commit | 97a2847d064e2fdd2e3cd4ff14cad2f377f0677a (patch) | |
tree | e49ce105dc6febc25dc3ceba6070ea3998c7330c /fs/reiserfs/prints.c | |
parent | e99a03c6f50a699d63b5751e3e88f84e43b037a7 (diff) | |
parent | d2d0395fd1778d4bf714adc5bfd23a5d748d7802 (diff) | |
download | linux-stable-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.tar.gz linux-stable-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.tar.bz2 linux-stable-97a2847d064e2fdd2e3cd4ff14cad2f377f0677a.zip |
Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeffm/linux-reiserfs into for_next_testing
Reiserfs locking fixes.
Diffstat (limited to 'fs/reiserfs/prints.c')
-rw-r--r-- | fs/reiserfs/prints.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c index c0b1112ab7e3..54944d5a4a6e 100644 --- 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, |