Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / reiserfs / objectid.c

diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c
index ea0cf8c28a9965a20ce35602fc6dd36919edbd00..3a6de810bd61848418b4254493ce7ac1dd345a1c 100644 (file)
--- a/fs/reiserfs/objectid.c
+++ b/fs/reiserfs/objectid.c
@@ -18,8 +18,7 @@
 static void check_objectid_map(struct super_block *s, __le32 * map)
 {
        if (le32_to_cpu(map[0]) != 1)
-               reiserfs_panic(s,
-                              "vs-15010: check_objectid_map: map corrupted: %lx",
+               reiserfs_panic(s, "vs-15010", "map corrupted: %lx",
                               (long unsigned int)le32_to_cpu(map[0]));
 
        // FIXME: add something else here
@@ -61,7 +60,7 @@ __u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th)
        /* comment needed -Hans */
        unused_objectid = le32_to_cpu(map[1]);
        if (unused_objectid == U32_MAX) {
-               reiserfs_warning(s, "%s: no more object ids", __func__);
+               reiserfs_warning(s, "reiserfs-15100", "no more object ids");
                reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s));
                return 0;
        }
@@ -160,9 +159,8 @@ void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,
                i += 2;
        }
 
-       reiserfs_warning(s,
-                        "vs-15011: reiserfs_release_objectid: tried to free free object id (%lu)",
-                        (long unsigned)objectid_to_release);
+       reiserfs_error(s, "vs-15011", "tried to free free object id (%lu)",
+                      (long unsigned)objectid_to_release);
 }
 
 int reiserfs_convert_objectid_map_v1(struct super_block *s)
@@ -182,7 +180,7 @@ int reiserfs_convert_objectid_map_v1(struct super_block *s)
 
        if (cur_size > new_size) {
                /* mark everyone used that was listed as free at the end of the objectid
-                ** map 
+                ** map
                 */
                objectid_map[new_size - 1] = objectid_map[cur_size - 1];
                set_sb_oid_cursize(disk_sb, new_size);