diff options
Diffstat (limited to 'fs/reiserfs/objectid.c')
-rw-r--r-- | fs/reiserfs/objectid.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/reiserfs/objectid.c b/fs/reiserfs/objectid.c index ea0cf8c28a99..3a6de810bd61 100644 --- a/fs/reiserfs/objectid.c +++ b/fs/reiserfs/objectid.c | |||
@@ -18,8 +18,7 @@ | |||
18 | static void check_objectid_map(struct super_block *s, __le32 * map) | 18 | static void check_objectid_map(struct super_block *s, __le32 * map) |
19 | { | 19 | { |
20 | if (le32_to_cpu(map[0]) != 1) | 20 | if (le32_to_cpu(map[0]) != 1) |
21 | reiserfs_panic(s, | 21 | reiserfs_panic(s, "vs-15010", "map corrupted: %lx", |
22 | "vs-15010: check_objectid_map: map corrupted: %lx", | ||
23 | (long unsigned int)le32_to_cpu(map[0])); | 22 | (long unsigned int)le32_to_cpu(map[0])); |
24 | 23 | ||
25 | // FIXME: add something else here | 24 | // FIXME: add something else here |
@@ -61,7 +60,7 @@ __u32 reiserfs_get_unused_objectid(struct reiserfs_transaction_handle *th) | |||
61 | /* comment needed -Hans */ | 60 | /* comment needed -Hans */ |
62 | unused_objectid = le32_to_cpu(map[1]); | 61 | unused_objectid = le32_to_cpu(map[1]); |
63 | if (unused_objectid == U32_MAX) { | 62 | if (unused_objectid == U32_MAX) { |
64 | reiserfs_warning(s, "%s: no more object ids", __func__); | 63 | reiserfs_warning(s, "reiserfs-15100", "no more object ids"); |
65 | reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s)); | 64 | reiserfs_restore_prepared_buffer(s, SB_BUFFER_WITH_SB(s)); |
66 | return 0; | 65 | return 0; |
67 | } | 66 | } |
@@ -160,9 +159,8 @@ void reiserfs_release_objectid(struct reiserfs_transaction_handle *th, | |||
160 | i += 2; | 159 | i += 2; |
161 | } | 160 | } |
162 | 161 | ||
163 | reiserfs_warning(s, | 162 | reiserfs_error(s, "vs-15011", "tried to free free object id (%lu)", |
164 | "vs-15011: reiserfs_release_objectid: tried to free free object id (%lu)", | 163 | (long unsigned)objectid_to_release); |
165 | (long unsigned)objectid_to_release); | ||
166 | } | 164 | } |
167 | 165 | ||
168 | int reiserfs_convert_objectid_map_v1(struct super_block *s) | 166 | int reiserfs_convert_objectid_map_v1(struct super_block *s) |
@@ -182,7 +180,7 @@ int reiserfs_convert_objectid_map_v1(struct super_block *s) | |||
182 | 180 | ||
183 | if (cur_size > new_size) { | 181 | if (cur_size > new_size) { |
184 | /* mark everyone used that was listed as free at the end of the objectid | 182 | /* mark everyone used that was listed as free at the end of the objectid |
185 | ** map | 183 | ** map |
186 | */ | 184 | */ |
187 | objectid_map[new_size - 1] = objectid_map[cur_size - 1]; | 185 | objectid_map[new_size - 1] = objectid_map[cur_size - 1]; |
188 | set_sb_oid_cursize(disk_sb, new_size); | 186 | set_sb_oid_cursize(disk_sb, new_size); |