Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / fs / reiserfs / objectid.c

diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c
index 90e4e52..3a6de81 100644 (file)
--- a/fs/reiserfs/objectid.c
+++ b/fs/reiserfs/objectid.c
@@ -159,8 +159,8 @@ void reiserfs_release_objectid(struct reiserfs_transaction_handle *th,
                i += 2;
        }
 
-       reiserfs_warning(s, "vs-15011", "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)
@@ -180,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);