diff options
| author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 23:36:34 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-07 01:08:10 +0200 |
| commit | b7cb1ce2205c45bf6d356cd358b52adb55bbcf5d (patch) | |
| tree | 8ce78fd4de9d804015efe5e94c56f993c50db4b3 /fs/hpfs/name.c | |
| parent | fs/ufs/balloc.c: remove err parameter in ufs_add_fragments (diff) | |
| download | linux-b7cb1ce2205c45bf6d356cd358b52adb55bbcf5d.tar.xz linux-b7cb1ce2205c45bf6d356cd358b52adb55bbcf5d.zip | |
fs/hpfs: convert printk to pr_foo()
No level printk in hptfs_error converted to pr_err (others to pr_warn or
pr_info)
This patch also fixes if/then/else checkpatch warnings
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Cc: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/hpfs/name.c')
| -rw-r--r-- | fs/hpfs/name.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/hpfs/name.c b/fs/hpfs/name.c index 9acdf338def0..61ffd04bbf8e 100644 --- a/fs/hpfs/name.c +++ b/fs/hpfs/name.c @@ -56,14 +56,15 @@ unsigned char *hpfs_translate_name(struct super_block *s, unsigned char *from, unsigned char *to; int i; if (hpfs_sb(s)->sb_chk >= 2) if (hpfs_is_name_long(from, len) != lng) { - printk("HPFS: Long name flag mismatch - name "); - for (i=0; i<len; i++) printk("%c", from[i]); - printk(" misidentified as %s.\n", lng ? "short" : "long"); - printk("HPFS: It's nothing serious. It could happen because of bug in OS/2.\nHPFS: Set checks=normal to disable this message.\n"); + pr_warn("HPFS: Long name flag mismatch - name "); + for (i = 0; i < len; i++) + pr_cont("%c", from[i]); + pr_cont(" misidentified as %s.\n", lng ? "short" : "long"); + pr_warn("HPFS: It's nothing serious. It could happen because of bug in OS/2.\nHPFS: Set checks=normal to disable this message.\n"); } if (!lc) return from; if (!(to = kmalloc(len, GFP_KERNEL))) { - printk("HPFS: can't allocate memory for name conversion buffer\n"); + pr_warn("HPFS: can't allocate memory for name conversion buffer\n"); return from; } for (i = 0; i < len; i++) to[i] = locase(hpfs_sb(s)->sb_cp_table,from[i]); |