]>
Commit | Line | Data |
---|---|---|
6a930a95 BS |
1 | From: Jeff Mahoney <jeffm@suse.com> |
2 | Subject: reiserfs: use more consistent printk formatting | |
3 | ||
4 | The output format between a warning/error/panic/info/etc changes with | |
5 | which one is used. | |
6 | ||
7 | The following patch makes the messages more internally consistent, but also | |
8 | more consistent with other Linux filesystems. | |
9 | ||
10 | Signed-off-by: Jeff Mahoney <jeffm@suse.com> | |
11 | ||
12 | -- | |
13 | fs/reiserfs/prints.c | 28 ++++++++++++++-------------- | |
14 | 1 file changed, 14 insertions(+), 14 deletions(-) | |
15 | ||
16 | --- a/fs/reiserfs/prints.c | |
17 | +++ b/fs/reiserfs/prints.c | |
18 | @@ -268,10 +268,10 @@ void reiserfs_warning(struct super_block | |
19 | { | |
20 | do_reiserfs_warning(fmt); | |
21 | if (sb) | |
22 | - printk(KERN_WARNING "ReiserFS: %s: warning: %s\n", | |
23 | - reiserfs_bdevname(sb), error_buf); | |
24 | + printk(KERN_WARNING "REISERFS warning (device %s): %s\n", | |
25 | + sb->s_id, error_buf); | |
26 | else | |
27 | - printk(KERN_WARNING "ReiserFS: warning: %s\n", error_buf); | |
28 | + printk(KERN_WARNING "REISERFS warning: %s\n", error_buf); | |
29 | } | |
30 | ||
31 | /* No newline.. reiserfs_info calls can be followed by printk's */ | |
32 | @@ -279,10 +279,10 @@ void reiserfs_info(struct super_block *s | |
33 | { | |
34 | do_reiserfs_warning(fmt); | |
35 | if (sb) | |
36 | - printk(KERN_NOTICE "ReiserFS: %s: %s", | |
37 | - reiserfs_bdevname(sb), error_buf); | |
38 | + printk(KERN_NOTICE "REISERFS (device %s): %s", | |
39 | + sb->s_id, error_buf); | |
40 | else | |
41 | - printk(KERN_NOTICE "ReiserFS: %s", error_buf); | |
42 | + printk(KERN_NOTICE "REISERFS %s:", error_buf); | |
43 | } | |
44 | ||
45 | /* No newline.. reiserfs_printk calls can be followed by printk's */ | |
46 | @@ -297,10 +297,10 @@ void reiserfs_debug(struct super_block * | |
47 | #ifdef CONFIG_REISERFS_CHECK | |
48 | do_reiserfs_warning(fmt); | |
49 | if (s) | |
50 | - printk(KERN_DEBUG "ReiserFS: %s: %s\n", | |
51 | - reiserfs_bdevname(s), error_buf); | |
52 | + printk(KERN_DEBUG "REISERFS debug (device %s): %s\n", | |
53 | + s->s_id, error_buf); | |
54 | else | |
55 | - printk(KERN_DEBUG "ReiserFS: %s\n", error_buf); | |
56 | + printk(KERN_DEBUG "REISERFS debug: %s\n", error_buf); | |
57 | #endif | |
58 | } | |
59 | ||
60 | @@ -368,15 +368,15 @@ void reiserfs_abort(struct super_block * | |
61 | do_reiserfs_warning(fmt); | |
62 | ||
63 | if (reiserfs_error_panic(sb)) { | |
64 | - panic(KERN_CRIT "REISERFS: panic (device %s): %s\n", | |
65 | - reiserfs_bdevname(sb), error_buf); | |
66 | + panic(KERN_CRIT "REISERFS panic (device %s): %s\n", sb->s_id, | |
67 | + error_buf); | |
68 | } | |
69 | ||
70 | - if (sb->s_flags & MS_RDONLY) | |
71 | + if (reiserfs_is_journal_aborted(SB_JOURNAL(sb))) | |
72 | return; | |
73 | ||
74 | - printk(KERN_CRIT "REISERFS: abort (device %s): %s\n", | |
75 | - reiserfs_bdevname(sb), error_buf); | |
76 | + printk(KERN_CRIT "REISERFS abort (device %s): %s\n", sb->s_id, | |
77 | + error_buf); | |
78 | ||
79 | sb->s_flags |= MS_RDONLY; | |
80 | reiserfs_journal_abort(sb, errno); |