diff options
Diffstat (limited to 'fs/hpfs/map.c')
-rw-r--r-- | fs/hpfs/map.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c index 3aa66ae1031e..398d7b1b99c8 100644 --- 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) | |||
65 | struct code_page_directory *cp = hpfs_map_sector(s, cps, &bh, 0); | 65 | struct code_page_directory *cp = hpfs_map_sector(s, cps, &bh, 0); |
66 | if (!cp) return NULL; | 66 | if (!cp) return NULL; |
67 | if (le32_to_cpu(cp->magic) != CP_DIR_MAGIC) { | 67 | if (le32_to_cpu(cp->magic) != CP_DIR_MAGIC) { |
68 | printk("HPFS: Code page directory magic doesn't match (magic = %08x)\n", le32_to_cpu(cp->magic)); | 68 | pr_warn("HPFS: Code page directory magic doesn't match (magic = %08x)\n", |
69 | le32_to_cpu(cp->magic)); | ||
69 | brelse(bh); | 70 | brelse(bh); |
70 | return NULL; | 71 | return NULL; |
71 | } | 72 | } |
72 | if (!le32_to_cpu(cp->n_code_pages)) { | 73 | if (!le32_to_cpu(cp->n_code_pages)) { |
73 | printk("HPFS: n_code_pages == 0\n"); | 74 | pr_warn("HPFS: n_code_pages == 0\n"); |
74 | brelse(bh); | 75 | brelse(bh); |
75 | return NULL; | 76 | return NULL; |
76 | } | 77 | } |
@@ -79,19 +80,19 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps) | |||
79 | brelse(bh); | 80 | brelse(bh); |
80 | 81 | ||
81 | if (cpi >= 3) { | 82 | if (cpi >= 3) { |
82 | printk("HPFS: Code page index out of array\n"); | 83 | pr_warn("HPFS: Code page index out of array\n"); |
83 | return NULL; | 84 | return NULL; |
84 | } | 85 | } |
85 | 86 | ||
86 | if (!(cpd = hpfs_map_sector(s, cpds, &bh, 0))) return NULL; | 87 | if (!(cpd = hpfs_map_sector(s, cpds, &bh, 0))) return NULL; |
87 | if (le16_to_cpu(cpd->offs[cpi]) > 0x178) { | 88 | if (le16_to_cpu(cpd->offs[cpi]) > 0x178) { |
88 | printk("HPFS: Code page index out of sector\n"); | 89 | pr_warn("HPFS: Code page index out of sector\n"); |
89 | brelse(bh); | 90 | brelse(bh); |
90 | return NULL; | 91 | return NULL; |
91 | } | 92 | } |
92 | ptr = (unsigned char *)cpd + le16_to_cpu(cpd->offs[cpi]) + 6; | 93 | ptr = (unsigned char *)cpd + le16_to_cpu(cpd->offs[cpi]) + 6; |
93 | if (!(cp_table = kmalloc(256, GFP_KERNEL))) { | 94 | if (!(cp_table = kmalloc(256, GFP_KERNEL))) { |
94 | printk("HPFS: out of memory for code page table\n"); | 95 | pr_warn("HPFS: out of memory for code page table\n"); |
95 | brelse(bh); | 96 | brelse(bh); |
96 | return NULL; | 97 | return NULL; |
97 | } | 98 | } |
@@ -114,7 +115,7 @@ __le32 *hpfs_load_bitmap_directory(struct super_block *s, secno bmp) | |||
114 | int i; | 115 | int i; |
115 | __le32 *b; | 116 | __le32 *b; |
116 | if (!(b = kmalloc(n * 512, GFP_KERNEL))) { | 117 | if (!(b = kmalloc(n * 512, GFP_KERNEL))) { |
117 | printk("HPFS: can't allocate memory for bitmap directory\n"); | 118 | pr_warn("HPFS: can't allocate memory for bitmap directory\n"); |
118 | return NULL; | 119 | return NULL; |
119 | } | 120 | } |
120 | for (i=0;i<n;i++) { | 121 | for (i=0;i<n;i++) { |
@@ -281,7 +282,9 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno, | |||
281 | hpfs_error(s, "dnode %08x does not end with \\377 entry", secno); | 282 | hpfs_error(s, "dnode %08x does not end with \\377 entry", secno); |
282 | goto bail; | 283 | goto bail; |
283 | } | 284 | } |
284 | if (b == 3) printk("HPFS: warning: unbalanced dnode tree, dnode %08x; see hpfs.txt 4 more info\n", secno); | 285 | if (b == 3) |
286 | pr_warn("HPFS: warning: unbalanced dnode tree, dnode %08x; see hpfs.txt 4 more info\n", | ||
287 | secno); | ||
285 | } | 288 | } |
286 | return dnode; | 289 | return dnode; |
287 | bail: | 290 | bail: |