Merge branch 'for-4.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

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

diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c
index 3aa66ae..442770e 100644 (file)
--- a/fs/hpfs/map.c
+++ b/fs/hpfs/map.c
@@ -65,12 +65,13 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps)
        struct code_page_directory *cp = hpfs_map_sector(s, cps, &bh, 0);
        if (!cp) return NULL;
        if (le32_to_cpu(cp->magic) != CP_DIR_MAGIC) {
-               printk("HPFS: Code page directory magic doesn't match (magic = %08x)\n", le32_to_cpu(cp->magic));
+               pr_err("Code page directory magic doesn't match (magic = %08x)\n",
+                       le32_to_cpu(cp->magic));
                brelse(bh);
                return NULL;
        }
        if (!le32_to_cpu(cp->n_code_pages)) {
-               printk("HPFS: n_code_pages == 0\n");
+               pr_err("n_code_pages == 0\n");
                brelse(bh);
                return NULL;
        }
@@ -79,19 +80,19 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps)
        brelse(bh);
 
        if (cpi >= 3) {
-               printk("HPFS: Code page index out of array\n");
+               pr_err("Code page index out of array\n");
                return NULL;
        }
        
        if (!(cpd = hpfs_map_sector(s, cpds, &bh, 0))) return NULL;
        if (le16_to_cpu(cpd->offs[cpi]) > 0x178) {
-               printk("HPFS: Code page index out of sector\n");
+               pr_err("Code page index out of sector\n");
                brelse(bh);
                return NULL;
        }
        ptr = (unsigned char *)cpd + le16_to_cpu(cpd->offs[cpi]) + 6;
        if (!(cp_table = kmalloc(256, GFP_KERNEL))) {
-               printk("HPFS: out of memory for code page table\n");
+               pr_err("out of memory for code page table\n");
                brelse(bh);
                return NULL;
        }
@@ -114,7 +115,7 @@ __le32 *hpfs_load_bitmap_directory(struct super_block *s, secno bmp)
        int i;
        __le32 *b;
        if (!(b = kmalloc(n * 512, GFP_KERNEL))) {
-               printk("HPFS: can't allocate memory for bitmap directory\n");
+               pr_err("can't allocate memory for bitmap directory\n");
                return NULL;
        }       
        for (i=0;i<n;i++) {
@@ -281,7 +282,9 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno,
                                hpfs_error(s, "dnode %08x does not end with \\377 entry", secno);
                                goto bail;
                        }
-                       if (b == 3) printk("HPFS: warning: unbalanced dnode tree, dnode %08x; see hpfs.txt 4 more info\n", secno);
+                       if (b == 3)
+                               pr_err("unbalanced dnode tree, dnode %08x; see hpfs.txt 4 more info\n",
+                                       secno);
                }
        return dnode;
        bail: