Merge branch 'for-jens' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/linux...

[cascardo/linux.git] / fs / hpfs / name.c

diff --git a/fs/hpfs/name.c b/fs/hpfs/name.c
index 9acdf33..b00d396 100644 (file)
--- 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_err("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_err("It's nothing serious. It could happen because of bug in OS/2.\nSet 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_err("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]);