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, 4 insertions, 6 deletions

diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c
index 256285dddb2..f8449cb74b5 100644
--- a/fs/reiserfs/tail_conversion.c
+++ b/fs/reiserfs/tail_conversion.c
@@ -92,8 +92,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode,
                    last item of the file */
                 if (search_for_position_by_key(sb, &end_key, path) ==
                     POSITION_FOUND)
-                        reiserfs_panic(sb,
-                                       "PAP-14050: direct2indirect: "
+                        reiserfs_panic(sb, "PAP-14050",
                                        "direct item (%K) not found", &end_key);
                 p_le_ih = PATH_PITEM_HEAD(path);
                 RFALSE(!is_direct_le_ih(p_le_ih),
@@ -214,8 +213,7 @@ int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_in
                 /* re-search indirect item */
                 if (search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path)
                     == POSITION_NOT_FOUND)
-                        reiserfs_panic(p_s_sb,
-                                       "PAP-5520: indirect2direct: "
+                        reiserfs_panic(p_s_sb, "PAP-5520",
                                        "item to be converted %K does not exist",
                                        p_s_item_key);
                 copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path));
@@ -224,8 +222,8 @@ int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_in
                     (ih_item_len(&s_ih) / UNFM_P_SIZE -
                      1) * p_s_sb->s_blocksize;
                 if (pos != pos1)
-                        reiserfs_panic(p_s_sb, "vs-5530: indirect2direct: "
-                                       "tail position changed while we were reading it");
+                        reiserfs_panic(p_s_sb, "vs-5530", "tail position "
+                                       "changed while we were reading it");
 #endif
         }