reiserfs: rework reiserfs_warning

ReiserFS warnings 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, 8 insertions, 4 deletions

diff --git a/fs/reiserfs/lbalance.c b/fs/reiserfs/lbalance.c
index 41bdd8c7588..381339b432e 100644
--- a/fs/reiserfs/lbalance.c
+++ b/fs/reiserfs/lbalance.c
@@ -1288,12 +1288,16 @@ void leaf_paste_entries(struct buffer_info *bi,
                         prev = (i != 0) ? deh_location(&(deh[i - 1])) : 0;
 
                         if (prev && prev <= deh_location(&(deh[i])))
-                                reiserfs_warning(NULL,
-                                                 "vs-10240: leaf_paste_entries: directory item (%h) corrupted (prev %a, cur(%d) %a)",
+                                reiserfs_warning(NULL, "vs-10240",
+                                                 "directory item (%h) "
+                                                 "corrupted (prev %a, "
+                                                 "cur(%d) %a)",
                                                  ih, deh + i - 1, i, deh + i);
                         if (next && next >= deh_location(&(deh[i])))
-                                reiserfs_warning(NULL,
-                                                 "vs-10250: leaf_paste_entries: directory item (%h) corrupted (cur(%d) %a, next %a)",
+                                reiserfs_warning(NULL, "vs-10250",
+                                                 "directory item (%h) "
+                                                 "corrupted (cur(%d) %a, "
+                                                 "next %a)",
                                                  ih, i, deh + i, deh + i + 1);
                 }
         }