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, 5 insertions, 3 deletions

diff --git a/fs/reiserfs/item_ops.c b/fs/reiserfs/item_ops.c
index 8a11cf39f57b..72cb1cc51b87 100644
--- a/fs/reiserfs/item_ops.c
+++ b/fs/reiserfs/item_ops.c
@@ -517,8 +517,9 @@ static int direntry_create_vi(struct virtual_node *vn,
                     ((is_affected
                       && (vn->vn_mode == M_PASTE
                           || vn->vn_mode == M_CUT)) ? insert_size : 0)) {
-                        reiserfs_panic(NULL,
-                                       "vs-8025: set_entry_sizes: (mode==%c, insert_size==%d), invalid length of directory item",
+                        reiserfs_panic(NULL, "vs-8025", "(mode==%c, "
+                                       "insert_size==%d), invalid length of "
+                                       "directory item",
                                        vn->vn_mode, insert_size);
                 }
         }
@@ -549,7 +550,8 @@ static int direntry_check_left(struct virtual_item *vi, int free,
         }
 
         if (entries == dir_u->entry_count) {
-                reiserfs_panic(NULL, "free space %d, entry_count %d\n", free,
+                reiserfs_panic(NULL, "item_ops-1",
+                               "free space %d, entry_count %d", free,
                                dir_u->entry_count);
         }