diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-01-18 20:43:05 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-18 22:20:22 -0500 |
| commit | 634725a92938b0f282b17cec0b007dca77adebd2 (patch) | |
| tree | c4dacf0c74ae3d322c37c010ee5cada2280eccca /fs/hfsplus/options.c | |
| parent | 5131cf154ad1c6e584efa58d17a469d0b80f49bd (diff) | |
[PATCH] hfs: cleanup HFS+ prints
Add the log level and a "hfs: " prefix to all kernel prints. (HFS and HFS+
will use the same prefix, as they share some code and could be merged at some
point.)
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/hfsplus/options.c')
| -rw-r--r-- | fs/hfsplus/options.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c index 935dafba0078..dc64fac00831 100644 --- a/fs/hfsplus/options.c +++ b/fs/hfsplus/options.c | |||
| @@ -83,58 +83,58 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi) | |||
| 83 | switch (token) { | 83 | switch (token) { |
| 84 | case opt_creator: | 84 | case opt_creator: |
| 85 | if (match_fourchar(&args[0], &sbi->creator)) { | 85 | if (match_fourchar(&args[0], &sbi->creator)) { |
| 86 | printk("HFS+-fs: creator requires a 4 character value\n"); | 86 | printk(KERN_ERR "hfs: creator requires a 4 character value\n"); |
| 87 | return 0; | 87 | return 0; |
| 88 | } | 88 | } |
| 89 | break; | 89 | break; |
| 90 | case opt_type: | 90 | case opt_type: |
| 91 | if (match_fourchar(&args[0], &sbi->type)) { | 91 | if (match_fourchar(&args[0], &sbi->type)) { |
| 92 | printk("HFS+-fs: type requires a 4 character value\n"); | 92 | printk(KERN_ERR "hfs: type requires a 4 character value\n"); |
| 93 | return 0; | 93 | return 0; |
| 94 | } | 94 | } |
| 95 | break; | 95 | break; |
| 96 | case opt_umask: | 96 | case opt_umask: |
| 97 | if (match_octal(&args[0], &tmp)) { | 97 | if (match_octal(&args[0], &tmp)) { |
| 98 | printk("HFS+-fs: umask requires a value\n"); | 98 | printk(KERN_ERR "hfs: umask requires a value\n"); |
| 99 | return 0; | 99 | return 0; |
| 100 | } | 100 | } |
| 101 | sbi->umask = (umode_t)tmp; | 101 | sbi->umask = (umode_t)tmp; |
| 102 | break; | 102 | break; |
| 103 | case opt_uid: | 103 | case opt_uid: |
| 104 | if (match_int(&args[0], &tmp)) { | 104 | if (match_int(&args[0], &tmp)) { |
| 105 | printk("HFS+-fs: uid requires an argument\n"); | 105 | printk(KERN_ERR "hfs: uid requires an argument\n"); |
| 106 | return 0; | 106 | return 0; |
| 107 | } | 107 | } |
| 108 | sbi->uid = (uid_t)tmp; | 108 | sbi->uid = (uid_t)tmp; |
| 109 | break; | 109 | break; |
| 110 | case opt_gid: | 110 | case opt_gid: |
| 111 | if (match_int(&args[0], &tmp)) { | 111 | if (match_int(&args[0], &tmp)) { |
| 112 | printk("HFS+-fs: gid requires an argument\n"); | 112 | printk(KERN_ERR "hfs: gid requires an argument\n"); |
| 113 | return 0; | 113 | return 0; |
| 114 | } | 114 | } |
| 115 | sbi->gid = (gid_t)tmp; | 115 | sbi->gid = (gid_t)tmp; |
| 116 | break; | 116 | break; |
| 117 | case opt_part: | 117 | case opt_part: |
| 118 | if (match_int(&args[0], &sbi->part)) { | 118 | if (match_int(&args[0], &sbi->part)) { |
| 119 | printk("HFS+-fs: part requires an argument\n"); | 119 | printk(KERN_ERR "hfs: part requires an argument\n"); |
| 120 | return 0; | 120 | return 0; |
| 121 | } | 121 | } |
| 122 | break; | 122 | break; |
| 123 | case opt_session: | 123 | case opt_session: |
| 124 | if (match_int(&args[0], &sbi->session)) { | 124 | if (match_int(&args[0], &sbi->session)) { |
| 125 | printk("HFS+-fs: session requires an argument\n"); | 125 | printk(KERN_ERR "hfs: session requires an argument\n"); |
| 126 | return 0; | 126 | return 0; |
| 127 | } | 127 | } |
| 128 | break; | 128 | break; |
| 129 | case opt_nls: | 129 | case opt_nls: |
| 130 | if (sbi->nls) { | 130 | if (sbi->nls) { |
| 131 | printk("HFS+-fs: unable to change nls mapping\n"); | 131 | printk(KERN_ERR "hfs: unable to change nls mapping\n"); |
| 132 | return 0; | 132 | return 0; |
| 133 | } | 133 | } |
| 134 | p = match_strdup(&args[0]); | 134 | p = match_strdup(&args[0]); |
| 135 | sbi->nls = load_nls(p); | 135 | sbi->nls = load_nls(p); |
| 136 | if (!sbi->nls) { | 136 | if (!sbi->nls) { |
| 137 | printk("HFS+-fs: unable to load nls mapping \"%s\"\n", p); | 137 | printk(KERN_ERR "hfs: unable to load nls mapping \"%s\"\n", p); |
| 138 | kfree(p); | 138 | kfree(p); |
| 139 | return 0; | 139 | return 0; |
| 140 | } | 140 | } |