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, 155 insertions, 148 deletions

diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c
index 5dbafb739401..972250c62896 100644
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
@@ -183,9 +183,9 @@ static int finish_unfinished(struct super_block *s)
                 if (REISERFS_SB(s)->s_qf_names[i]) {
                         int ret = reiserfs_quota_on_mount(s, i);
                         if (ret < 0)
-                                reiserfs_warning(s,
-                                                 "reiserfs: cannot turn on journaled quota: error %d",
-                                                 ret);
+                                reiserfs_warning(s, "reiserfs-2500",
+                                                 "cannot turn on journaled "
+                                                 "quota: error %d", ret);
                 }
         }
 #endif
@@ -195,17 +195,16 @@ static int finish_unfinished(struct super_block *s)
         while (!retval) {
                 retval = search_item(s, &max_cpu_key, &path);
                 if (retval != ITEM_NOT_FOUND) {
-                        reiserfs_warning(s,
-                                         "vs-2140: finish_unfinished: search_by_key returned %d",
-                                         retval);
+                        reiserfs_error(s, "vs-2140",
+                                       "search_by_key returned %d", retval);
                         break;
                 }
 
                 bh = get_last_bh(&path);
                 item_pos = get_item_pos(&path);
                 if (item_pos != B_NR_ITEMS(bh)) {
-                        reiserfs_warning(s,
-                                         "vs-2060: finish_unfinished: wrong position found");
+                        reiserfs_warning(s, "vs-2060",
+                                         "wrong position found");
                         break;
                 }
                 item_pos--;
@@ -235,8 +234,7 @@ static int finish_unfinished(struct super_block *s)
                 if (!inode) {
                         /* the unlink almost completed, it just did not manage to remove
                            "save" link and release objectid */
-                        reiserfs_warning(s,
-                                         "vs-2180: finish_unfinished: iget failed for %K",
+                        reiserfs_warning(s, "vs-2180", "iget failed for %K",
                                          &obj_key);
                         retval = remove_save_link_only(s, &save_link_key, 1);
                         continue;
@@ -244,8 +242,8 @@ static int finish_unfinished(struct super_block *s)
 
                 if (!truncate && inode->i_nlink) {
                         /* file is not unlinked */
-                        reiserfs_warning(s,
-                                         "vs-2185: finish_unfinished: file %K is not unlinked",
+                        reiserfs_warning(s, "vs-2185",
+                                         "file %K is not unlinked",
                                          &obj_key);
                         retval = remove_save_link_only(s, &save_link_key, 0);
                         continue;
@@ -257,8 +255,9 @@ static int finish_unfinished(struct super_block *s)
                            The only imaginable way is to execute unfinished truncate request
                            then boot into old kernel, remove the file and create dir with
                            the same key. */
-                        reiserfs_warning(s,
-                                         "green-2101: impossible truncate on a directory %k. Please report",
+                        reiserfs_warning(s, "green-2101",
+                                         "impossible truncate on a "
+                                         "directory %k. Please report",
                                          INODE_PKEY(inode));
                         retval = remove_save_link_only(s, &save_link_key, 0);
                         truncate = 0;
@@ -288,9 +287,10 @@ static int finish_unfinished(struct super_block *s)
                                 /* removal gets completed in iput */
                                 retval = 0;
                         } else {
-                                reiserfs_warning(s, "Dead loop in "
-                                                "finish_unfinished detected, "
-                                                "just remove save link\n");
+                                reiserfs_warning(s, "super-2189", "Dead loop "
+                                                 "in finish_unfinished "
+                                                 "detected, just remove "
+                                                 "save link\n");
                                 retval = remove_save_link_only(s,
                                                         &save_link_key, 0);
                         }
@@ -360,8 +360,9 @@ void add_save_link(struct reiserfs_transaction_handle *th,
         } else {
                 /* truncate */
                 if (S_ISDIR(inode->i_mode))
-                        reiserfs_warning(inode->i_sb,
-                                         "green-2102: Adding a truncate savelink for a directory %k! Please report",
+                        reiserfs_warning(inode->i_sb, "green-2102",
+                                         "Adding a truncate savelink for "
+                                         "a directory %k! Please report",
                                          INODE_PKEY(inode));
                 set_cpu_key_k_offset(&key, 1);
                 set_cpu_key_k_type(&key, TYPE_INDIRECT);
@@ -376,9 +377,9 @@ void add_save_link(struct reiserfs_transaction_handle *th,
         retval = search_item(inode->i_sb, &key, &path);
         if (retval != ITEM_NOT_FOUND) {
                 if (retval != -ENOSPC)
-                        reiserfs_warning(inode->i_sb, "vs-2100: add_save_link:"
-                                         "search_by_key (%K) returned %d", &key,
-                                         retval);
+                        reiserfs_error(inode->i_sb, "vs-2100",
+                                       "search_by_key (%K) returned %d", &key,
+                                       retval);
                 pathrelse(&path);
                 return;
         }
@@ -391,9 +392,8 @@ void add_save_link(struct reiserfs_transaction_handle *th,
             reiserfs_insert_item(th, &path, &key, &ih, NULL, (char *)&link);
         if (retval) {
                 if (retval != -ENOSPC)
-                        reiserfs_warning(inode->i_sb,
-                                         "vs-2120: add_save_link: insert_item returned %d",
-                                         retval);
+                        reiserfs_error(inode->i_sb, "vs-2120",
+                                       "insert_item returned %d", retval);
         } else {
                 if (truncate)
                         REISERFS_I(inode)->i_flags |=
@@ -492,8 +492,7 @@ static void reiserfs_put_super(struct super_block *s)
         print_statistics(s);
 
         if (REISERFS_SB(s)->reserved_blocks != 0) {
-                reiserfs_warning(s,
-                                 "green-2005: reiserfs_put_super: reserved blocks left %d",
+                reiserfs_warning(s, "green-2005", "reserved blocks left %d",
                                  REISERFS_SB(s)->reserved_blocks);
         }
 
@@ -559,8 +558,8 @@ static void reiserfs_dirty_inode(struct inode *inode)
 
         int err = 0;
         if (inode->i_sb->s_flags & MS_RDONLY) {
-                reiserfs_warning(inode->i_sb,
-                                 "clm-6006: writing inode %lu on readonly FS",
+                reiserfs_warning(inode->i_sb, "clm-6006",
+                                 "writing inode %lu on readonly FS",
                                  inode->i_ino);
                 return;
         }
@@ -757,7 +756,7 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
                            char **opt_arg, unsigned long *bit_flags)
 {
         char *p;
-        /* foo=bar, 
+        /* foo=bar,
            ^   ^  ^
            |   |  +-- option_end
            |   +-- arg_start
@@ -792,13 +791,15 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
                         if (bit_flags) {
                                 if (opt->clrmask ==
                                     (1 << REISERFS_UNSUPPORTED_OPT))
-                                        reiserfs_warning(s, "%s not supported.",
+                                        reiserfs_warning(s, "super-6500",
+                                                         "%s not supported.\n",
                                                          p);
                                 else
                                         *bit_flags &= ~opt->clrmask;
                                 if (opt->setmask ==
                                     (1 << REISERFS_UNSUPPORTED_OPT))
-                                        reiserfs_warning(s, "%s not supported.",
+                                        reiserfs_warning(s, "super-6501",
+                                                         "%s not supported.\n",
                                                          p);
                                 else
                                         *bit_flags |= opt->setmask;
@@ -807,7 +808,8 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
                 }
         }
         if (!opt->option_name) {
-                reiserfs_warning(s, "unknown mount option \"%s\"", p);
+                reiserfs_warning(s, "super-6502",
+                                 "unknown mount option \"%s\"", p);
                 return -1;
         }
 
@@ -815,8 +817,9 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
         switch (*p) {
         case '=':
                 if (!opt->arg_required) {
-                        reiserfs_warning(s,
-                                         "the option \"%s\" does not require an argument",
+                        reiserfs_warning(s, "super-6503",
+                                         "the option \"%s\" does not "
+                                         "require an argument\n",
                                          opt->option_name);
                         return -1;
                 }
@@ -824,14 +827,15 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
 
         case 0:
                 if (opt->arg_required) {
-                        reiserfs_warning(s,
-                                         "the option \"%s\" requires an argument",
-                                         opt->option_name);
+                        reiserfs_warning(s, "super-6504",
+                                         "the option \"%s\" requires an "
+                                         "argument\n", opt->option_name);
                         return -1;
                 }
                 break;
         default:
-                reiserfs_warning(s, "head of option \"%s\" is only correct",
+                reiserfs_warning(s, "super-6505",
+                                 "head of option \"%s\" is only correct\n",
                                  opt->option_name);
                 return -1;
         }
@@ -843,7 +847,8 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
             && !(opt->arg_required & (1 << REISERFS_OPT_ALLOWEMPTY))
             && !strlen(p)) {
                 /* this catches "option=," if not allowed */
-                reiserfs_warning(s, "empty argument for \"%s\"",
+                reiserfs_warning(s, "super-6506",
+                                 "empty argument for \"%s\"\n",
                                  opt->option_name);
                 return -1;
         }
@@ -865,7 +870,8 @@ static int reiserfs_getopt(struct super_block *s, char **cur, opt_desc_t * opts,
                 }
         }
 
-        reiserfs_warning(s, "bad value \"%s\" for option \"%s\"", p,
+        reiserfs_warning(s, "super-6506",
+                         "bad value \"%s\" for option \"%s\"\n", p,
                          opt->option_name);
         return -1;
 }
@@ -955,9 +961,9 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                                 *blocks = simple_strtoul(arg, &p, 0);
                                 if (*p != '\0') {
                                         /* NNN does not look like a number */
-                                        reiserfs_warning(s,
-                                                         "reiserfs_parse_options: bad value %s",
-                                                         arg);
+                                        reiserfs_warning(s, "super-6507",
+                                                         "bad value %s for "
+                                                         "-oresize\n", arg);
                                         return 0;
                                 }
                         }
@@ -968,8 +974,8 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                         unsigned long val = simple_strtoul(arg, &p, 0);
                         /* commit=NNN (time in seconds) */
                         if (*p != '\0' || val >= (unsigned int)-1) {
-                                reiserfs_warning(s,
-                                                 "reiserfs_parse_options: bad value %s",
+                                reiserfs_warning(s, "super-6508",
+                                                 "bad value %s for -ocommit\n",
                                                  arg);
                                 return 0;
                         }
@@ -977,16 +983,18 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                 }
 
                 if (c == 'w') {
-                        reiserfs_warning(s, "reiserfs: nolargeio option is no longer supported");
+                        reiserfs_warning(s, "super-6509", "nolargeio option "
+                                         "is no longer supported");
                         return 0;
                 }
 
                 if (c == 'j') {
                         if (arg && *arg && jdev_name) {
                                 if (*jdev_name) {       //Hm, already assigned?
-                                        reiserfs_warning(s,
-                                                         "reiserfs_parse_options: journal device was already  specified to be %s",
-                                                         *jdev_name);
+                                        reiserfs_warning(s, "super-6510",
+                                                         "journal device was "
+                                                         "already specified to "
+                                                         "be %s", *jdev_name);
                                         return 0;
                                 }
                                 *jdev_name = arg;
@@ -998,29 +1006,35 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
 
                         if (sb_any_quota_loaded(s) &&
                             (!*arg != !REISERFS_SB(s)->s_qf_names[qtype])) {
-                                reiserfs_warning(s,
-                                                 "reiserfs_parse_options: cannot change journaled quota options when quota turned on.");
+                                reiserfs_warning(s, "super-6511",
+                                                 "cannot change journaled "
+                                                 "quota options when quota "
+                                                 "turned on.");
                                 return 0;
                         }
                         if (*arg) {     /* Some filename specified? */
                                 if (REISERFS_SB(s)->s_qf_names[qtype]
                                     && strcmp(REISERFS_SB(s)->s_qf_names[qtype],
                                               arg)) {
-                                        reiserfs_warning(s,
-                                                         "reiserfs_parse_options: %s quota file already specified.",
+                                        reiserfs_warning(s, "super-6512",
+                                                         "%s quota file "
+                                                         "already specified.",
                                                          QTYPE2NAME(qtype));
                                         return 0;
                                 }
                                 if (strchr(arg, '/')) {
-                                        reiserfs_warning(s,
-                                                         "reiserfs_parse_options: quotafile must be on filesystem root.");
+                                        reiserfs_warning(s, "super-6513",
+                                                         "quotafile must be "
+                                                         "on filesystem root.");
                                         return 0;
                                 }
                                 qf_names[qtype] =
                                     kmalloc(strlen(arg) + 1, GFP_KERNEL);
                                 if (!qf_names[qtype]) {
-                                        reiserfs_warning(s,
-                                                         "reiserfs_parse_options: not enough memory for storing quotafile name.");
+                                        reiserfs_warning(s, "reiserfs-2502",
+                                                         "not enough memory "
+                                                         "for storing "
+                                                         "quotafile name.");
                                         return 0;
                                 }
                                 strcpy(qf_names[qtype], arg);
@@ -1038,21 +1052,24 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
                         else if (!strcmp(arg, "vfsv0"))
                                 *qfmt = QFMT_VFS_V0;
                         else {
-                                reiserfs_warning(s,
-                                                 "reiserfs_parse_options: unknown quota format specified.");
+                                reiserfs_warning(s, "super-6514",
+                                                 "unknown quota format "
+                                                 "specified.");
                                 return 0;
                         }
                         if (sb_any_quota_loaded(s) &&
                             *qfmt != REISERFS_SB(s)->s_jquota_fmt) {
-                                reiserfs_warning(s,
-                                                 "reiserfs_parse_options: cannot change journaled quota options when quota turned on.");
+                                reiserfs_warning(s, "super-6515",
+                                                 "cannot change journaled "
+                                                 "quota options when quota "
+                                                 "turned on.");
                                 return 0;
                         }
                 }
 #else
                 if (c == 'u' || c == 'g' || c == 'f') {
-                        reiserfs_warning(s,
-                                         "reiserfs_parse_options: journaled quota options not supported.");
+                        reiserfs_warning(s, "reiserfs-2503", "journaled "
+                                         "quota options not supported.");
                         return 0;
                 }
 #endif
@@ -1061,15 +1078,15 @@ static int reiserfs_parse_options(struct super_block *s, char *options,	/* strin
 #ifdef CONFIG_QUOTA
         if (!REISERFS_SB(s)->s_jquota_fmt && !*qfmt
             && (qf_names[USRQUOTA] || qf_names[GRPQUOTA])) {
-                reiserfs_warning(s,
-                                 "reiserfs_parse_options: journaled quota format not specified.");
+                reiserfs_warning(s, "super-6515",
+                                 "journaled quota format not specified.");
                 return 0;
         }
         /* This checking is not precise wrt the quota type but for our purposes it is sufficient */
         if (!(*mount_options & (1 << REISERFS_QUOTA))
             && sb_any_quota_loaded(s)) {
-                reiserfs_warning(s,
-                                 "reiserfs_parse_options: quota options must be present when quota is turned on.");
+                reiserfs_warning(s, "super-6516", "quota options must "
+                                 "be present when quota is turned on.");
                 return 0;
         }
 #endif
@@ -1129,14 +1146,15 @@ static void handle_attrs(struct super_block *s)
 
         if (reiserfs_attrs(s)) {
                 if (old_format_only(s)) {
-                        reiserfs_warning(s,
-                                         "reiserfs: cannot support attributes on 3.5.x disk format");
+                        reiserfs_warning(s, "super-6517", "cannot support "
+                                         "attributes on 3.5.x disk format");
                         REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS);
                         return;
                 }
                 if (!(le32_to_cpu(rs->s_flags) & reiserfs_attrs_cleared)) {
-                        reiserfs_warning(s,
-                                         "reiserfs: cannot support attributes until flag is set in super-block");
+                        reiserfs_warning(s, "super-6518", "cannot support "
+                                         "attributes until flag is set in "
+                                         "super-block");
                         REISERFS_SB(s)->s_mount_opt &= ~(1 << REISERFS_ATTRS);
                 }
         }
@@ -1278,6 +1296,8 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg)
                 REISERFS_SB(s)->s_mount_state = sb_umount_state(rs);
                 s->s_flags &= ~MS_RDONLY;
                 set_sb_umount_state(rs, REISERFS_ERROR_FS);
+                if (!old_format_only(s))
+                        set_sb_mnt_count(rs, sb_mnt_count(rs) + 1);
                 /* mark_buffer_dirty (SB_BUFFER_WITH_SB (s), 1); */
                 journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s));
                 REISERFS_SB(s)->s_mount_state = REISERFS_VALID_FS;
@@ -1312,7 +1332,7 @@ static int read_super_block(struct super_block *s, int offset)
 
         bh = sb_bread(s, offset / s->s_blocksize);
         if (!bh) {
-                reiserfs_warning(s, "sh-2006: read_super_block: "
+                reiserfs_warning(s, "sh-2006",
                                  "bread failed (dev %s, block %lu, size %lu)",
                                  reiserfs_bdevname(s), offset / s->s_blocksize,
                                  s->s_blocksize);
@@ -1326,15 +1346,15 @@ static int read_super_block(struct super_block *s, int offset)
         }
         //
         // ok, reiserfs signature (old or new) found in at the given offset
-        //    
+        //
         fs_blocksize = sb_blocksize(rs);
         brelse(bh);
         sb_set_blocksize(s, fs_blocksize);
 
         bh = sb_bread(s, offset / s->s_blocksize);
         if (!bh) {
-                reiserfs_warning(s, "sh-2007: read_super_block: "
-                                 "bread failed (dev %s, block %lu, size %lu)\n",
+                reiserfs_warning(s, "sh-2007",
+                                 "bread failed (dev %s, block %lu, size %lu)",
                                  reiserfs_bdevname(s), offset / s->s_blocksize,
                                  s->s_blocksize);
                 return 1;
@@ -1342,8 +1362,8 @@ static int read_super_block(struct super_block *s, int offset)
 
         rs = (struct reiserfs_super_block *)bh->b_data;
         if (sb_blocksize(rs) != s->s_blocksize) {
-                reiserfs_warning(s, "sh-2011: read_super_block: "
-                                 "can't find a reiserfs filesystem on (dev %s, block %Lu, size %lu)\n",
+                reiserfs_warning(s, "sh-2011", "can't find a reiserfs "
+                                 "filesystem on (dev %s, block %Lu, size %lu)",
                                  reiserfs_bdevname(s),
                                  (unsigned long long)bh->b_blocknr,
                                  s->s_blocksize);
@@ -1353,9 +1373,10 @@ static int read_super_block(struct super_block *s, int offset)
 
         if (rs->s_v1.s_root_block == cpu_to_le32(-1)) {
                 brelse(bh);
-                reiserfs_warning(s,
-                                 "Unfinished reiserfsck --rebuild-tree run detected. Please run\n"
-                                 "reiserfsck --rebuild-tree and wait for a completion. If that fails\n"
+                reiserfs_warning(s, "super-6519", "Unfinished reiserfsck "
+                                 "--rebuild-tree run detected. Please run\n"
+                                 "reiserfsck --rebuild-tree and wait for a "
+                                 "completion. If that fails\n"
                                  "get newer reiserfsprogs package");
                 return 1;
         }
@@ -1367,18 +1388,15 @@ static int read_super_block(struct super_block *s, int offset)
                 /* magic is of non-standard journal filesystem, look at s_version to
                    find which format is in use */
                 if (sb_version(rs) == REISERFS_VERSION_2)
-                        reiserfs_warning(s,
-                                         "read_super_block: found reiserfs format \"3.6\""
-                                         " with non-standard journal");
+                        reiserfs_info(s, "found reiserfs format \"3.6\""
+                                      " with non-standard journal\n");
                 else if (sb_version(rs) == REISERFS_VERSION_1)
-                        reiserfs_warning(s,
-                                         "read_super_block: found reiserfs format \"3.5\""
-                                         " with non-standard journal");
+                        reiserfs_info(s, "found reiserfs format \"3.5\""
+                                      " with non-standard journal\n");
                 else {
-                        reiserfs_warning(s,
-                                         "sh-2012: read_super_block: found unknown "
-                                         "format \"%u\" of reiserfs with non-standard magic",
-                                         sb_version(rs));
+                        reiserfs_warning(s, "sh-2012", "found unknown "
+                                         "format \"%u\" of reiserfs with "
+                                         "non-standard magic", sb_version(rs));
                         return 1;
                 }
         } else
@@ -1408,8 +1426,7 @@ static int reread_meta_blocks(struct super_block *s)
         ll_rw_block(READ, 1, &(SB_BUFFER_WITH_SB(s)));
         wait_on_buffer(SB_BUFFER_WITH_SB(s));
         if (!buffer_uptodate(SB_BUFFER_WITH_SB(s))) {
-                reiserfs_warning(s,
-                                 "reread_meta_blocks, error reading the super");
+                reiserfs_warning(s, "reiserfs-2504", "error reading the super");
                 return 1;
         }
 
@@ -1452,8 +1469,8 @@ static __u32 find_hash_out(struct super_block *s)
                         if (reiserfs_rupasov_hash(s)) {
                                 hash = YURA_HASH;
                         }
-                        reiserfs_warning(s, "FS seems to be empty, autodetect "
-                                         "is using the default hash");
+                        reiserfs_info(s, "FS seems to be empty, autodetect "
+                                         "is using the default hash\n");
                         break;
                 }
                 r5hash = GET_HASH_VALUE(r5_hash(de.de_name, de.de_namelen));
@@ -1473,10 +1490,10 @@ static __u32 find_hash_out(struct super_block *s)
                         && (yurahash ==
                             GET_HASH_VALUE(deh_offset
                                            (&(de.de_deh[de.de_entry_num])))))) {
-                        reiserfs_warning(s,
-                                         "Unable to automatically detect hash function. "
-                                         "Please mount with -o hash={tea,rupasov,r5}",
-                                         reiserfs_bdevname(s));
+                        reiserfs_warning(s, "reiserfs-2506", "Unable to "
+                                         "automatically detect hash function. "
+                                         "Please mount with -o "
+                                         "hash={tea,rupasov,r5}");
                         hash = UNSET_HASH;
                         break;
                 }
@@ -1490,7 +1507,8 @@ static __u32 find_hash_out(struct super_block *s)
                          (deh_offset(&(de.de_deh[de.de_entry_num]))) == r5hash)
                         hash = R5_HASH;
                 else {
-                        reiserfs_warning(s, "Unrecognised hash function");
+                        reiserfs_warning(s, "reiserfs-2506",
+                                         "Unrecognised hash function");
                         hash = UNSET_HASH;
                 }
         } while (0);
@@ -1514,21 +1532,24 @@ static int what_hash(struct super_block *s)
                 code = find_hash_out(s);
 
         if (code != UNSET_HASH && reiserfs_hash_detect(s)) {
-                /* detection has found the hash, and we must check against the 
-                 ** mount options 
+                /* detection has found the hash, and we must check against the
+                 ** mount options
                  */
                 if (reiserfs_rupasov_hash(s) && code != YURA_HASH) {
-                        reiserfs_warning(s, "Error, %s hash detected, "
+                        reiserfs_warning(s, "reiserfs-2507",
+                                         "Error, %s hash detected, "
                                          "unable to force rupasov hash",
                                          reiserfs_hashname(code));
                         code = UNSET_HASH;
                 } else if (reiserfs_tea_hash(s) && code != TEA_HASH) {
-                        reiserfs_warning(s, "Error, %s hash detected, "
+                        reiserfs_warning(s, "reiserfs-2508",
+                                         "Error, %s hash detected, "
                                          "unable to force tea hash",
                                          reiserfs_hashname(code));
                         code = UNSET_HASH;
                 } else if (reiserfs_r5_hash(s) && code != R5_HASH) {
-                        reiserfs_warning(s, "Error, %s hash detected, "
+                        reiserfs_warning(s, "reiserfs-2509",
+                                         "Error, %s hash detected, "
                                          "unable to force r5 hash",
                                          reiserfs_hashname(code));
                         code = UNSET_HASH;
@@ -1544,7 +1565,7 @@ static int what_hash(struct super_block *s)
                 }
         }
 
-        /* if we are mounted RW, and we have a new valid hash code, update 
+        /* if we are mounted RW, and we have a new valid hash code, update
          ** the super
          */
         if (code != UNSET_HASH &&
@@ -1587,9 +1608,9 @@ static int function2code(hashf_t func)
         return 0;
 }
 
-#define SWARN(silent, s, ...)                   \
+#define SWARN(silent, s, id, ...)                       \
         if (!(silent))                          \
-                reiserfs_warning (s, __VA_ARGS__)
+                reiserfs_warning(s, id, __VA_ARGS__)
 
 static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
 {
@@ -1623,10 +1644,6 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
         REISERFS_SB(s)->s_alloc_options.preallocmin = 0;
         /* Preallocate by 16 blocks (17-1) at once */
         REISERFS_SB(s)->s_alloc_options.preallocsize = 17;
-#ifdef CONFIG_REISERFS_FS_XATTR
-        /* Initialize the rwsem for xattr dir */
-        init_rwsem(&REISERFS_SB(s)->xattr_dir_sem);
-#endif
         /* setup default block allocator options */
         reiserfs_init_alloc_options(s);
 
@@ -1641,8 +1658,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
 #endif
 
         if (blocks) {
-                SWARN(silent, s, "jmacd-7: reiserfs_fill_super: resize option "
-                      "for remount only");
+                SWARN(silent, s, "jmacd-7", "resize option for remount only");
                 goto error;
         }
 
@@ -1651,8 +1667,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                 old_format = 1;
         /* try new format (64-th 1k block), which can contain reiserfs super block */
         else if (read_super_block(s, REISERFS_DISK_OFFSET_IN_BYTES)) {
-                SWARN(silent, s,
-                      "sh-2021: reiserfs_fill_super: can not find reiserfs on %s",
+                SWARN(silent, s, "sh-2021", "can not find reiserfs on %s",
                       reiserfs_bdevname(s));
                 goto error;
         }
@@ -1664,13 +1679,12 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
         if (s->s_bdev && s->s_bdev->bd_inode
             && i_size_read(s->s_bdev->bd_inode) <
             sb_block_count(rs) * sb_blocksize(rs)) {
-                SWARN(silent, s,
-                      "Filesystem on %s cannot be mounted because it is bigger than the device",
-                      reiserfs_bdevname(s));
-                SWARN(silent, s,
-                      "You may need to run fsck or increase size of your LVM partition");
-                SWARN(silent, s,
-                      "Or may be you forgot to reboot after fdisk when it told you to");
+                SWARN(silent, s, "", "Filesystem cannot be "
+                      "mounted because it is bigger than the device");
+                SWARN(silent, s, "", "You may need to run fsck "
+                      "or increase size of your LVM partition");
+                SWARN(silent, s, "", "Or may be you forgot to "
+                      "reboot after fdisk when it told you to");
                 goto error;
         }
 
@@ -1678,14 +1692,13 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
         sbi->s_mount_state = REISERFS_VALID_FS;
 
         if ((errval = reiserfs_init_bitmap_cache(s))) {
-                SWARN(silent, s,
-                      "jmacd-8: reiserfs_fill_super: unable to read bitmap");
+                SWARN(silent, s, "jmacd-8", "unable to read bitmap");
                 goto error;
         }
         errval = -EINVAL;
 #ifdef CONFIG_REISERFS_CHECK
-        SWARN(silent, s, "CONFIG_REISERFS_CHECK is set ON");
-        SWARN(silent, s, "- it is slow mode for debugging.");
+        SWARN(silent, s, "", "CONFIG_REISERFS_CHECK is set ON");
+        SWARN(silent, s, "", "- it is slow mode for debugging.");
 #endif
 
         /* make data=ordered the default */
@@ -1706,8 +1719,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
         }
         // set_device_ro(s->s_dev, 1) ;
         if (journal_init(s, jdev_name, old_format, commit_max_age)) {
-                SWARN(silent, s,
-                      "sh-2022: reiserfs_fill_super: unable to initialize journal space");
+                SWARN(silent, s, "sh-2022",
+                      "unable to initialize journal space");
                 goto error;
         } else {
                 jinit_done = 1; /* once this is set, journal_release must be called
@@ -1715,8 +1728,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                                  */
         }
         if (reread_meta_blocks(s)) {
-                SWARN(silent, s,
-                      "jmacd-9: reiserfs_fill_super: unable to reread meta blocks after journal init");
+                SWARN(silent, s, "jmacd-9",
+                      "unable to reread meta blocks after journal init");
                 goto error;
         }
 
@@ -1724,8 +1737,8 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                 goto error;
 
         if (bdev_read_only(s->s_bdev) && !(s->s_flags & MS_RDONLY)) {
-                SWARN(silent, s,
-                      "clm-7000: Detected readonly device, marking FS readonly");
+                SWARN(silent, s, "clm-7000",
+                      "Detected readonly device, marking FS readonly");
                 s->s_flags |= MS_RDONLY;
         }
         args.objectid = REISERFS_ROOT_OBJECTID;
@@ -1734,8 +1747,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
             iget5_locked(s, REISERFS_ROOT_OBJECTID, reiserfs_find_actor,
                          reiserfs_init_locked_inode, (void *)(&args));
         if (!root_inode) {
-                SWARN(silent, s,
-                      "jmacd-10: reiserfs_fill_super: get root inode failed");
+                SWARN(silent, s, "jmacd-10", "get root inode failed");
                 goto error;
         }
 
@@ -1784,7 +1796,7 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                  * avoiding corruption. -jeffm */
                 if (bmap_would_wrap(reiserfs_bmap_count(s)) &&
                     sb_bmap_nr(rs) != 0) {
-                        reiserfs_warning(s, "super-2030: This file system "
+                        reiserfs_warning(s, "super-2030", "This file system "
                                         "claims to use %u bitmap blocks in "
                                         "its super block, but requires %u. "
                                         "Clearing to zero.", sb_bmap_nr(rs),
@@ -1817,7 +1829,9 @@ static int reiserfs_fill_super(struct super_block *s, void *data, int silent)
                         } else if (!silent) {
                                 reiserfs_info(s, "using 3.5.x disk format\n");
                         }
-                }
+                } else
+                        set_sb_mnt_count(rs, sb_mnt_count(rs) + 1);
+
 
                 journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB(s));
                 errval = journal_end(&th, s, 1);
@@ -2031,8 +2045,8 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
         if (!(REISERFS_I(inode)->i_flags & i_nopack_mask)) {
                 err = reiserfs_unpack(inode, NULL);
                 if (err) {
-                        reiserfs_warning(sb,
-                                "reiserfs: Unpacking tail of quota file failed"
+                        reiserfs_warning(sb, "super-6520",
+                                "Unpacking tail of quota file failed"
                                 " (%d). Cannot turn on quotas.", err);
                         err = -EINVAL;
                         goto out;
@@ -2043,8 +2057,8 @@ static int reiserfs_quota_on(struct super_block *sb, int type, int format_id,
         if (REISERFS_SB(sb)->s_qf_names[type]) {
                 /* Quotafile not of fs root? */
                 if (path.dentry->d_parent != sb->s_root)
-                        reiserfs_warning(sb,
-                                 "reiserfs: Quota file not on filesystem root. "
+                        reiserfs_warning(sb, "super-6521",
+                                 "Quota file not on filesystem root. "
                                  "Journalled quota will not work.");
         }
 
@@ -2195,9 +2209,6 @@ static int __init init_reiserfs_fs(void)
                 return ret;
         }
 
-        if ((ret = reiserfs_xattr_register_handlers()))
-                goto failed_reiserfs_xattr_register_handlers;
-
         reiserfs_proc_info_global_init();
         reiserfs_proc_register_global("version",
                                       reiserfs_global_version_in_proc);
@@ -2208,9 +2219,6 @@ static int __init init_reiserfs_fs(void)
                 return 0;
         }
 
-        reiserfs_xattr_unregister_handlers();
-
-      failed_reiserfs_xattr_register_handlers:
         reiserfs_proc_unregister_global("version");
         reiserfs_proc_info_global_done();
         destroy_inodecache();
@@ -2220,7 +2228,6 @@ static int __init init_reiserfs_fs(void)
 
 static void __exit exit_reiserfs_fs(void)
 {
-        reiserfs_xattr_unregister_handlers();
         reiserfs_proc_unregister_global("version");
         reiserfs_proc_info_global_done();
         unregister_filesystem(&reiserfs_fs_type);