Merge tag 'stable/for-linus-3.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[karo-tx-linux.git] / fs / hpfs / buffer.c

diff --git a/fs/hpfs/buffer.c b/fs/hpfs/buffer.c
index 139ef1684d074bba059ff0c401f65273420e7c6a..8057fe4e6574948bef508f7d4f2a65af66a3cf89 100644 (file)
--- 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_err("%s(): read error\n", __func__);
                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_err("%s(): getblk failed\n", __func__);
                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_err("%s(): unaligned read\n", __func__);
                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_err("%s(): out of memory\n", __func__);
                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_err("%s(): unaligned read\n", __func__);
                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_err("%s(): out of memory\n", __func__);
                goto bail4;
        }
        return qbh->data;