hfs/hfsplus: convert printks to pr_<level>

Use a more current logging style.

Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
hfsplus now uses "hfsplus: " for all messages.
Coalesce formats.
Prefix debugging messages too.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Vyacheslav Dubeyko <slava@dubeyko.com>
Cc: Hin-Tak Leung <htl10@users.sourceforge.net>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 16 insertions, 13 deletions

diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
index 07d94ce1d278..1ab19e660e69 100644
--- a/fs/hfs/btree.c
+++ b/fs/hfs/btree.c
@@ -48,7 +48,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
                                     mdb->drXTFlSize, be32_to_cpu(mdb->drXTClpSiz));
                 if (HFS_I(tree->inode)->alloc_blocks >
                                         HFS_I(tree->inode)->first_blocks) {
-                        printk(KERN_ERR "hfs: invalid btree extent records\n");
+                        pr_err("invalid btree extent records\n");
                         unlock_new_inode(tree->inode);
                         goto free_inode;
                 }
@@ -60,8 +60,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
                                     mdb->drCTFlSize, be32_to_cpu(mdb->drCTClpSiz));
 
                 if (!HFS_I(tree->inode)->first_blocks) {
-                        printk(KERN_ERR "hfs: invalid btree extent records "
-                                                                "(0 size).\n");
+                        pr_err("invalid btree extent records (0 size)\n");
                         unlock_new_inode(tree->inode);
                         goto free_inode;
                 }
@@ -100,15 +99,15 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke
         switch (id) {
         case HFS_EXT_CNID:
                 if (tree->max_key_len != HFS_MAX_EXT_KEYLEN) {
-                        printk(KERN_ERR "hfs: invalid extent max_key_len %d\n",
-                                tree->max_key_len);
+                        pr_err("invalid extent max_key_len %d\n",
+                               tree->max_key_len);
                         goto fail_page;
                 }
                 break;
         case HFS_CAT_CNID:
                 if (tree->max_key_len != HFS_MAX_CAT_KEYLEN) {
-                        printk(KERN_ERR "hfs: invalid catalog max_key_len %d\n",
-                                tree->max_key_len);
+                        pr_err("invalid catalog max_key_len %d\n",
+                               tree->max_key_len);
                         goto fail_page;
                 }
                 break;
@@ -146,8 +145,9 @@ void hfs_btree_close(struct hfs_btree *tree)
                 while ((node = tree->node_hash[i])) {
                         tree->node_hash[i] = node->next_hash;
                         if (atomic_read(&node->refcnt))
-                                printk(KERN_ERR "hfs: node %d:%d still has %d user(s)!\n",
-                                        node->tree->cnid, node->this, atomic_read(&node->refcnt));
+                                pr_err("node %d:%d still has %d user(s)!\n",
+                                       node->tree->cnid, node->this,
+                                       atomic_read(&node->refcnt));
                         hfs_bnode_free(node);
                         tree->node_hash_cnt--;
                 }
@@ -290,7 +290,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
                 kunmap(*pagep);
                 nidx = node->next;
                 if (!nidx) {
-                        printk(KERN_DEBUG "hfs: create new bmap node...\n");
+                        printk(KERN_DEBUG "create new bmap node...\n");
                         next_node = hfs_bmap_new_bmap(node, idx);
                 } else
                         next_node = hfs_bnode_find(tree, nidx);
@@ -331,7 +331,8 @@ void hfs_bmap_free(struct hfs_bnode *node)
                 hfs_bnode_put(node);
                 if (!i) {
                         /* panic */;
-                        printk(KERN_CRIT "hfs: unable to free bnode %u. bmap not found!\n", node->this);
+                        pr_crit("unable to free bnode %u. bmap not found!\n",
+                                node->this);
                         return;
                 }
                 node = hfs_bnode_find(tree, i);
@@ -339,7 +340,8 @@ void hfs_bmap_free(struct hfs_bnode *node)
                         return;
                 if (node->type != HFS_NODE_MAP) {
                         /* panic */;
-                        printk(KERN_CRIT "hfs: invalid bmap found! (%u,%d)\n", node->this, node->type);
+                        pr_crit("invalid bmap found! (%u,%d)\n",
+                                node->this, node->type);
                         hfs_bnode_put(node);
                         return;
                 }
@@ -352,7 +354,8 @@ void hfs_bmap_free(struct hfs_bnode *node)
         m = 1 << (~nidx & 7);
         byte = data[off];
         if (!(byte & m)) {
-                printk(KERN_CRIT "hfs: trying to free free bnode %u(%d)\n", node->this, node->type);
+                pr_crit("trying to free free bnode %u(%d)\n",
+                        node->this, node->type);
                 kunmap(page);
                 hfs_bnode_put(node);
                 return;