Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / fs / reiserfs / prints.c

diff --git a/fs/reiserfs/prints.c b/fs/reiserfs/prints.c
index 78b40621b88b7571e5065aa005feae888092cb0e..5e7388b32d020f17b6b22fb515bbe04a8a3ee67c 100644 (file)
--- a/fs/reiserfs/prints.c
+++ b/fs/reiserfs/prints.c
@@ -2,7 +2,6 @@
  * Copyright 2000 by Hans Reiser, licensing governed by reiserfs/README
  */
 
-#include <linux/config.h>
 #include <linux/time.h>
 #include <linux/fs.h>
 #include <linux/reiserfs_fs.h>
@@ -143,7 +142,7 @@ static void sprintf_buffer_head(char *buf, struct buffer_head *bh)
        char b[BDEVNAME_SIZE];
 
        sprintf(buf,
-               "dev %s, size %d, blocknr %llu, count %d, state 0x%lx, page %p, (%s, %s, %s)",
+               "dev %s, size %zd, blocknr %llu, count %d, state 0x%lx, page %p, (%s, %s, %s)",
                bdevname(bh->b_bdev, b), bh->b_size,
                (unsigned long long)bh->b_blocknr, atomic_read(&(bh->b_count)),
                bh->b_state, bh->b_page,
@@ -357,13 +356,11 @@ extern struct tree_balance *cur_tb;
 void reiserfs_panic(struct super_block *sb, const char *fmt, ...)
 {
        do_reiserfs_warning(fmt);
-       printk(KERN_EMERG "REISERFS: panic (device %s): %s\n",
-              reiserfs_bdevname(sb), error_buf);
-       BUG();
 
-       /* this is not actually called, but makes reiserfs_panic() "noreturn" */
-       panic("REISERFS: panic (device %s): %s\n",
-             reiserfs_bdevname(sb), error_buf);
+       dump_stack();
+
+       panic(KERN_EMERG "REISERFS: panic (device %s): %s\n",
+              reiserfs_bdevname(sb), error_buf);
 }
 
 void reiserfs_abort(struct super_block *sb, int errno, const char *fmt, ...)