diff options
author | Fabian Frederick <fabf@skynet.be> | 2014-06-06 14:36:34 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-06 16:08:10 -0700 |
commit | b7cb1ce2205c45bf6d356cd358b52adb55bbcf5d (patch) | |
tree | 8ce78fd4de9d804015efe5e94c56f993c50db4b3 /fs/hpfs/buffer.c | |
parent | 45641c82c1e3aeaef72d693b24938da45ffb0cfc (diff) | |
download | blackbird-op-linux-b7cb1ce2205c45bf6d356cd358b52adb55bbcf5d.tar.gz blackbird-op-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/buffer.c')
-rw-r--r-- | fs/hpfs/buffer.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c index 139ef1684d07..4b61be32a91d 100644 --- a/fs/hpfs/buffer.c +++ b/fs/hpfs/buffer.c @@ -55,7 +55,7 @@ void *hpfs_map_sector(struct super_block *s, unsigned secno, struct buffer_head if (bh != NULL) return bh->b_data; else { - printk("HPFS: hpfs_map_sector: read error\n"); + pr_warn("HPFS: hpfs_map_sector: read error\n"); return NULL; } } @@ -76,7 +76,7 @@ void *hpfs_get_sector(struct super_block *s, unsigned secno, struct buffer_head set_buffer_uptodate(bh); return bh->b_data; } else { - printk("HPFS: hpfs_get_sector: getblk failed\n"); + pr_warn("HPFS: hpfs_get_sector: getblk failed\n"); return NULL; } } @@ -93,7 +93,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe cond_resched(); if (secno & 3) { - printk("HPFS: hpfs_map_4sectors: unaligned read\n"); + pr_warn("HPFS: hpfs_map_4sectors: unaligned read\n"); return NULL; } @@ -112,7 +112,7 @@ void *hpfs_map_4sectors(struct super_block *s, unsigned secno, struct quad_buffe qbh->data = data = kmalloc(2048, GFP_NOFS); if (!data) { - printk("HPFS: hpfs_map_4sectors: out of memory\n"); + pr_warn("HPFS: hpfs_map_4sectors: out of memory\n"); goto bail4; } @@ -145,7 +145,7 @@ void *hpfs_get_4sectors(struct super_block *s, unsigned secno, hpfs_lock_assert(s); if (secno & 3) { - printk("HPFS: hpfs_get_4sectors: unaligned read\n"); + pr_warn("HPFS: hpfs_get_4sectors: unaligned read\n"); return NULL; } @@ -161,7 +161,7 @@ void *hpfs_get_4sectors(struct super_block *s, unsigned secno, } if (!(qbh->data = kmalloc(2048, GFP_NOFS))) { - printk("HPFS: hpfs_get_4sectors: out of memory\n"); + pr_warn("HPFS: hpfs_get_4sectors: out of memory\n"); goto bail4; } return qbh->data; |