reiserfs: rework reiserfs_panic

ReiserFS panics can be somewhat inconsistent.
In some cases:
 * a unique identifier may be associated with it
 * the function name may be included
 * the device may be printed separately

This patch aims to make warnings more consistent. reiserfs_warning() prints
the device name, so printing it a second time is not required. The function
name for a warning is always helpful in debugging, so it is now automatically
inserted into the output. Hans has stated that every warning should have
a unique identifier. Some cases lack them, others really shouldn't have them.
reiserfs_warning() now expects an id associated with each message. In the
rare case where one isn't needed, "" will suffice.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/reiserfs/ibalance.c b/fs/reiserfs/ibalance.c
index de391a82b999..063b5514fe29 100644
--- a/fs/reiserfs/ibalance.c
+++ b/fs/reiserfs/ibalance.c
@@ -105,8 +105,8 @@ static void internal_define_dest_src_infos(int shift_mode,
                 break;
 
         default:
-                reiserfs_panic(tb->tb_sb,
-                               "internal_define_dest_src_infos: shift type is unknown (%d)",
+                reiserfs_panic(tb->tb_sb, "ibalance-1",
+                               "shift type is unknown (%d)",
                                shift_mode);
         }
 }
@@ -702,8 +702,8 @@ static void balance_internal_when_delete(struct tree_balance *tb,
 
                 return;
         }
-        reiserfs_panic(tb->tb_sb,
-                       "balance_internal_when_delete: unexpected tb->lnum[%d]==%d or tb->rnum[%d]==%d",
+        reiserfs_panic(tb->tb_sb, "ibalance-2",
+                       "unexpected tb->lnum[%d]==%d or tb->rnum[%d]==%d",
                        h, tb->lnum[h], h, tb->rnum[h]);
 }
 
@@ -940,8 +940,8 @@ int balance_internal(struct tree_balance *tb,	/* tree_balance structure
                 struct block_head *blkh;
 
                 if (tb->blknum[h] != 1)
-                        reiserfs_panic(NULL,
-                                       "balance_internal: One new node required for creating the new root");
+                        reiserfs_panic(NULL, "ibalance-3", "One new node "
+                                       "required for creating the new root");
                 /* S[h] = empty buffer from the list FEB. */
                 tbSh = get_FEB(tb);
                 blkh = B_BLK_HEAD(tbSh);