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, 23 insertions, 29 deletions

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index 98b92a3da14a..51b116103041 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -64,8 +64,8 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)
         unsigned int bmap_count = reiserfs_bmap_count(s);
 
         if (block == 0 || block >= SB_BLOCK_COUNT(s)) {
-                reiserfs_warning(s,
-                                 "vs-4010: is_reusable: block number is out of range %lu (%u)",
+                reiserfs_warning(s, "vs-4010",
+                                 "block number is out of range %lu (%u)",
                                  block, SB_BLOCK_COUNT(s));
                 return 0;
         }
@@ -79,30 +79,29 @@ int is_reusable(struct super_block *s, b_blocknr_t block, int bit_value)
                 b_blocknr_t bmap1 = REISERFS_SB(s)->s_sbh->b_blocknr + 1;
                 if (block >= bmap1 &&
                     block <= bmap1 + bmap_count) {
-                        reiserfs_warning(s, "vs: 4019: is_reusable: "
-                                         "bitmap block %lu(%u) can't be freed or reused",
+                        reiserfs_warning(s, "vs-4019", "bitmap block %lu(%u) "
+                                         "can't be freed or reused",
                                          block, bmap_count);
                         return 0;
                 }
         } else {
                 if (offset == 0) {
-                        reiserfs_warning(s, "vs: 4020: is_reusable: "
-                                         "bitmap block %lu(%u) can't be freed or reused",
+                        reiserfs_warning(s, "vs-4020", "bitmap block %lu(%u) "
+                                         "can't be freed or reused",
                                          block, bmap_count);
                         return 0;
                 }
         }
 
         if (bmap >= bmap_count) {
-                reiserfs_warning(s,
-                                 "vs-4030: is_reusable: there is no so many bitmap blocks: "
-                                 "block=%lu, bitmap_nr=%u", block, bmap);
+                reiserfs_warning(s, "vs-4030", "bitmap for requested block "
+                                 "is out of range: block=%lu, bitmap_nr=%u",
+                                 block, bmap);
                 return 0;
         }
 
         if (bit_value == 0 && block == SB_ROOT_BLOCK(s)) {
-                reiserfs_warning(s,
-                                 "vs-4050: is_reusable: this is root block (%u), "
+                reiserfs_warning(s, "vs-4050", "this is root block (%u), "
                                  "it must be busy", SB_ROOT_BLOCK(s));
                 return 0;
         }
@@ -154,8 +153,8 @@ static int scan_bitmap_block(struct reiserfs_transaction_handle *th,
 /* - I mean `a window of zero bits' as in description of this function - Zam. */
 
         if (!bi) {
-                reiserfs_warning(s, "NULL bitmap info pointer for bitmap %d",
-                                 bmap_n);
+                reiserfs_warning(s, "jdm-4055", "NULL bitmap info pointer "
+                                 "for bitmap %d", bmap_n);
                 return 0;
         }
 
@@ -400,11 +399,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
         get_bit_address(s, block, &nr, &offset);
 
         if (nr >= reiserfs_bmap_count(s)) {
-                reiserfs_warning(s, "vs-4075: reiserfs_free_block: "
-                                 "block %lu is out of range on %s "
-                                 "(nr=%u,max=%u)", block,
-                                 reiserfs_bdevname(s), nr,
-                                 reiserfs_bmap_count(s));
+                reiserfs_warning(s, "vs-4075", "block %lu is out of range",
+                                 block);
                 return;
         }
 
@@ -416,9 +412,8 @@ static void _reiserfs_free_block(struct reiserfs_transaction_handle *th,
 
         /* clear bit for the given block in bit map */
         if (!reiserfs_test_and_clear_le_bit(offset, bmbh->b_data)) {
-                reiserfs_warning(s, "vs-4080: reiserfs_free_block: "
-                                 "free_block (%s:%lu)[dev:blocknr]: bit already cleared",
-                                 reiserfs_bdevname(s), block);
+                reiserfs_warning(s, "vs-4080",
+                                 "block %lu: bit already cleared", block);
         }
         apbi[nr].free_count++;
         journal_mark_dirty(th, s, bmbh);
@@ -477,9 +472,8 @@ static void __discard_prealloc(struct reiserfs_transaction_handle *th,
         BUG_ON(!th->t_trans_id);
 #ifdef CONFIG_REISERFS_CHECK
         if (ei->i_prealloc_count < 0)
-                reiserfs_warning(th->t_super,
-                                 "zam-4001:%s: inode has negative prealloc blocks count.",
-                                 __func__);
+                reiserfs_warning(th->t_super, "zam-4001",
+                                 "inode has negative prealloc blocks count.");
 #endif
         while (ei->i_prealloc_count > 0) {
                 reiserfs_free_prealloc_block(th, inode, ei->i_prealloc_block);
@@ -515,9 +509,9 @@ void reiserfs_discard_all_prealloc(struct reiserfs_transaction_handle *th)
                                 i_prealloc_list);
 #ifdef CONFIG_REISERFS_CHECK
                 if (!ei->i_prealloc_count) {
-                        reiserfs_warning(th->t_super,
-                                         "zam-4001:%s: inode is in prealloc list but has no preallocated blocks.",
-                                         __func__);
+                        reiserfs_warning(th->t_super, "zam-4001",
+                                         "inode is in prealloc list but has "
+                                         "no preallocated blocks.");
                 }
 #endif
                 __discard_prealloc(th, ei);
@@ -631,8 +625,8 @@ int reiserfs_parse_alloc_options(struct super_block *s, char *options)
                         continue;
                 }
 
-                reiserfs_warning(s, "zam-4001: %s : unknown option - %s",
-                                 __func__, this_char);
+                reiserfs_warning(s, "zam-4001", "unknown option - %s",
+                                 this_char);
                 return 1;
         }