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 | 14da17f9c4a880e3418f7f04071df3cb2e8636e8 (patch) | |
| tree | 304cf850a7337b83a5eef2720e23a9dff48469b4 /fs/hpfs/map.c | |
| parent | fs/hpfs: convert printk to pr_foo() (diff) | |
| download | linux-14da17f9c4a880e3418f7f04071df3cb2e8636e8.tar.xz linux-14da17f9c4a880e3418f7f04071df3cb2e8636e8.zip | |
fs/hpfs: use pr_fmt for logging
Also remove redundant level names (warning:...)
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/map.c')
| -rw-r--r-- | fs/hpfs/map.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/hpfs/map.c b/fs/hpfs/map.c index 398d7b1b99c8..6ac8f7a74efc 100644 --- a/fs/hpfs/map.c +++ b/fs/hpfs/map.c @@ -65,13 +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) { - pr_warn("HPFS: Code page directory magic doesn't match (magic = %08x)\n", + pr_warn("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)) { - pr_warn("HPFS: n_code_pages == 0\n"); + pr_warn("n_code_pages == 0\n"); brelse(bh); return NULL; } @@ -80,19 +80,19 @@ unsigned char *hpfs_load_code_page(struct super_block *s, secno cps) brelse(bh); if (cpi >= 3) { - pr_warn("HPFS: Code page index out of array\n"); + pr_warn("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) { - pr_warn("HPFS: Code page index out of sector\n"); + pr_warn("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))) { - pr_warn("HPFS: out of memory for code page table\n"); + pr_warn("out of memory for code page table\n"); brelse(bh); return NULL; } @@ -115,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))) { - pr_warn("HPFS: can't allocate memory for bitmap directory\n"); + pr_warn("can't allocate memory for bitmap directory\n"); return NULL; } for (i=0;i<n;i++) { @@ -283,7 +283,7 @@ struct dnode *hpfs_map_dnode(struct super_block *s, unsigned secno, goto bail; } if (b == 3) - pr_warn("HPFS: warning: unbalanced dnode tree, dnode %08x; see hpfs.txt 4 more info\n", + pr_warn("unbalanced dnode tree, dnode %08x; see hpfs.txt 4 more info\n", secno); } return dnode; |