Merge branch 'reiserfs-updates' from Jeff Mahoney

* reiserfs-updates: (35 commits)
  reiserfs: rename [cn]_* variables
  reiserfs: rename p_._ variables
  reiserfs: rename p_s_tb to tb
  reiserfs: rename p_s_inode to inode
  reiserfs: rename p_s_bh to bh
  reiserfs: rename p_s_sb to sb
  reiserfs: strip trailing whitespace
  reiserfs: cleanup path functions
  reiserfs: factor out buffer_info initialization
  reiserfs: add atomic addition of selinux attributes during inode creation
  reiserfs: use generic readdir for operations across all xattrs
  reiserfs: journaled xattrs
  reiserfs: use generic xattr handlers
  reiserfs: remove i_has_xattr_dir
  reiserfs: make per-inode xattr locking more fine grained
  reiserfs: eliminate per-super xattr lock
  reiserfs: simplify xattr internal file lookups/opens
  reiserfs: Clean up xattrs when REISERFS_FS_XATTR is unset
  reiserfs: remove IS_PRIVATE helpers
  reiserfs: remove link detection code
  ...

Fixed up conflicts manually due to:
 - quota name cleanups vs variable naming changes:
	fs/reiserfs/inode.c
	fs/reiserfs/namei.c
	fs/reiserfs/stree.c
        fs/reiserfs/xattr.c
 - exported include header cleanups
	include/linux/reiserfs_fs.h

1 files changed, 34 insertions, 38 deletions

diff --git a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
index f32d1425cc9f..e716161ab325 100644
--- a/fs/reiserfs/bitmap.c
+++ b/fs/reiserfs/bitmap.c
@@ -40,8 +40,8 @@
 
 #define SET_OPTION(optname) \
    do { \
-        reiserfs_warning(s, "reiserfs: option \"%s\" is set", #optname); \
-        set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \
+        reiserfs_info(s, "block allocator option \"%s\" is set", #optname); \
+        set_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s)); \
     } while(0)
 #define TEST_OPTION(optname, s) \
     test_bit(_ALLOC_ ## optname , &SB_ALLOC_OPTS(s))
@@ -64,9 +64,9 @@ 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)",
-                                 block, SB_BLOCK_COUNT(s));
+                reiserfs_error(s, "vs-4010",
+                               "block number is out of range %lu (%u)",
+                               block, SB_BLOCK_COUNT(s));
                 return 0;
         }
 
@@ -79,31 +79,30 @@ 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",
-                                         block, bmap_count);
+                        reiserfs_error(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",
-                                         block, bmap_count);
+                        reiserfs_error(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_error(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), "
-                                 "it must be busy", SB_ROOT_BLOCK(s));
+                reiserfs_error(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_error(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_error(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_error(s, "vs-4080",
+                               "block %lu: bit already cleared", block);
         }
         apbi[nr].free_count++;
         journal_mark_dirty(th, s, bmbh);
@@ -445,7 +440,7 @@ void reiserfs_free_block(struct reiserfs_transaction_handle *th,
                 return;
 
         if (block > sb_block_count(REISERFS_SB(s)->s_rs)) {
-                reiserfs_panic(th->t_super, "bitmap-4072",
+                reiserfs_error(th->t_super, "bitmap-4072",
                                "Trying to free block outside file system "
                                "boundaries (%lu > %lu)",
                                block, sb_block_count(REISERFS_SB(s)->s_rs));
@@ -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_error(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_error(th->t_super, "zam-4001",
+                                       "inode is in prealloc list but has "
+                                       "no preallocated blocks.");
                 }
 #endif
                 __discard_prealloc(th, ei);
@@ -631,12 +625,12 @@ 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;
         }
 
-        reiserfs_warning(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));
+        reiserfs_info(s, "allocator options = [%08x]\n", SB_ALLOC_OPTS(s));
         return 0;
 }
 
@@ -1221,7 +1215,9 @@ void reiserfs_cache_bitmap_metadata(struct super_block *sb,
         unsigned long *cur = (unsigned long *)(bh->b_data + bh->b_size);
 
         /* The first bit must ALWAYS be 1 */
-        BUG_ON(!reiserfs_test_le_bit(0, (unsigned long *)bh->b_data));
+        if (!reiserfs_test_le_bit(0, (unsigned long *)bh->b_data))
+                reiserfs_error(sb, "reiserfs-2025", "bitmap block %lu is "
+                               "corrupted: first bit must be 1", bh->b_blocknr);
 
         info->free_count = 0;