diff options
author | Jeff Mahoney <jeffm@suse.com> | 2009-03-30 14:02:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-30 15:16:36 -0400 |
commit | c3a9c2109f84882b9b3178f6b1838d550d3df0ec (patch) | |
tree | 08a502b8013eabb562f03be45622b0f63b1a34b9 /fs/reiserfs/tail_conversion.c | |
parent | 78b6513d2881f1a759fb9825a036d926392de084 (diff) |
reiserfs: rework reiserfs_panic
ReiserFS panics can be somewhat inconsistent.
In some cases:
* a unique identifier may be associated with it
* the function name may be included
* the device may be printed separately
This patch aims to make warnings more consistent. reiserfs_warning() prints
the device name, so printing it a second time is not required. The function
name for a warning is always helpful in debugging, so it is now automatically
inserted into the output. Hans has stated that every warning should have
a unique identifier. Some cases lack them, others really shouldn't have them.
reiserfs_warning() now expects an id associated with each message. In the
rare case where one isn't needed, "" will suffice.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/reiserfs/tail_conversion.c')
-rw-r--r-- | fs/reiserfs/tail_conversion.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c index 256285dddb20..f8449cb74b53 100644 --- a/fs/reiserfs/tail_conversion.c +++ b/fs/reiserfs/tail_conversion.c | |||
@@ -92,8 +92,7 @@ int direct2indirect(struct reiserfs_transaction_handle *th, struct inode *inode, | |||
92 | last item of the file */ | 92 | last item of the file */ |
93 | if (search_for_position_by_key(sb, &end_key, path) == | 93 | if (search_for_position_by_key(sb, &end_key, path) == |
94 | POSITION_FOUND) | 94 | POSITION_FOUND) |
95 | reiserfs_panic(sb, | 95 | reiserfs_panic(sb, "PAP-14050", |
96 | "PAP-14050: direct2indirect: " | ||
97 | "direct item (%K) not found", &end_key); | 96 | "direct item (%K) not found", &end_key); |
98 | p_le_ih = PATH_PITEM_HEAD(path); | 97 | p_le_ih = PATH_PITEM_HEAD(path); |
99 | RFALSE(!is_direct_le_ih(p_le_ih), | 98 | RFALSE(!is_direct_le_ih(p_le_ih), |
@@ -214,8 +213,7 @@ int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_in | |||
214 | /* re-search indirect item */ | 213 | /* re-search indirect item */ |
215 | if (search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path) | 214 | if (search_for_position_by_key(p_s_sb, p_s_item_key, p_s_path) |
216 | == POSITION_NOT_FOUND) | 215 | == POSITION_NOT_FOUND) |
217 | reiserfs_panic(p_s_sb, | 216 | reiserfs_panic(p_s_sb, "PAP-5520", |
218 | "PAP-5520: indirect2direct: " | ||
219 | "item to be converted %K does not exist", | 217 | "item to be converted %K does not exist", |
220 | p_s_item_key); | 218 | p_s_item_key); |
221 | copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path)); | 219 | copy_item_head(&s_ih, PATH_PITEM_HEAD(p_s_path)); |
@@ -224,8 +222,8 @@ int indirect2direct(struct reiserfs_transaction_handle *th, struct inode *p_s_in | |||
224 | (ih_item_len(&s_ih) / UNFM_P_SIZE - | 222 | (ih_item_len(&s_ih) / UNFM_P_SIZE - |
225 | 1) * p_s_sb->s_blocksize; | 223 | 1) * p_s_sb->s_blocksize; |
226 | if (pos != pos1) | 224 | if (pos != pos1) |
227 | reiserfs_panic(p_s_sb, "vs-5530: indirect2direct: " | 225 | reiserfs_panic(p_s_sb, "vs-5530", "tail position " |
228 | "tail position changed while we were reading it"); | 226 | "changed while we were reading it"); |
229 | #endif | 227 | #endif |
230 | } | 228 | } |
231 | 229 | ||