Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...

[cascardo/linux.git] / fs / hfsplus / btree.c

diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
index efb689c..0c6540c 100644 (file)
--- a/fs/hfsplus/btree.c
+++ b/fs/hfsplus/btree.c
@@ -40,8 +40,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
        tree->inode = inode;
 
        if (!HFSPLUS_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");
                goto free_inode;
        }
 
@@ -68,12 +67,12 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
        switch (id) {
        case HFSPLUS_EXT_CNID:
                if (tree->max_key_len != HFSPLUS_EXT_KEYLEN - sizeof(u16)) {
-                       printk(KERN_ERR "hfs: invalid extent max_key_len %d\n",
+                       pr_err("invalid extent max_key_len %d\n",
                                tree->max_key_len);
                        goto fail_page;
                }
                if (tree->attributes & HFS_TREE_VARIDXKEYS) {
-                       printk(KERN_ERR "hfs: invalid extent btree flag\n");
+                       pr_err("invalid extent btree flag\n");
                        goto fail_page;
                }
 
@@ -81,12 +80,12 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
                break;
        case HFSPLUS_CAT_CNID:
                if (tree->max_key_len != HFSPLUS_CAT_KEYLEN - sizeof(u16)) {
-                       printk(KERN_ERR "hfs: invalid catalog max_key_len %d\n",
+                       pr_err("invalid catalog max_key_len %d\n",
                                tree->max_key_len);
                        goto fail_page;
                }
                if (!(tree->attributes & HFS_TREE_VARIDXKEYS)) {
-                       printk(KERN_ERR "hfs: invalid catalog btree flag\n");
+                       pr_err("invalid catalog btree flag\n");
                        goto fail_page;
                }
 
@@ -100,19 +99,19 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id)
                break;
        case HFSPLUS_ATTR_CNID:
                if (tree->max_key_len != HFSPLUS_ATTR_KEYLEN - sizeof(u16)) {
-                       printk(KERN_ERR "hfs: invalid attributes max_key_len %d\n",
+                       pr_err("invalid attributes max_key_len %d\n",
                                tree->max_key_len);
                        goto fail_page;
                }
                tree->keycmp = hfsplus_attr_bin_cmp_key;
                break;
        default:
-               printk(KERN_ERR "hfs: unknown B*Tree requested\n");
+               pr_err("unknown B*Tree requested\n");
                goto fail_page;
        }
 
        if (!(tree->attributes & HFS_TREE_BIGKEYS)) {
-               printk(KERN_ERR "hfs: invalid btree flag\n");
+               pr_err("invalid btree flag\n");
                goto fail_page;
        }
 
@@ -155,7 +154,7 @@ 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_CRIT "hfs: node %d:%d "
+                               pr_crit("node %d:%d "
                                                "still has %d user(s)!\n",
                                        node->tree->cnid, node->this,
                                        atomic_read(&node->refcnt));
@@ -303,7 +302,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
                kunmap(*pagep);
                nidx = node->next;
                if (!nidx) {
-                       dprint(DBG_BNODE_MOD, "hfs: create new bmap node.\n");
+                       hfs_dbg(BNODE_MOD, "create new bmap node\n");
                        next_node = hfs_bmap_new_bmap(node, idx);
                } else
                        next_node = hfs_bnode_find(tree, nidx);
@@ -329,7 +328,7 @@ void hfs_bmap_free(struct hfs_bnode *node)
        u32 nidx;
        u8 *data, byte, m;
 
-       dprint(DBG_BNODE_MOD, "btree_free_node: %u\n", node->this);
+       hfs_dbg(BNODE_MOD, "btree_free_node: %u\n", node->this);
        BUG_ON(!node->this);
        tree = node->tree;
        nidx = node->this;
@@ -345,7 +344,7 @@ void hfs_bmap_free(struct hfs_bnode *node)
                hfs_bnode_put(node);
                if (!i) {
                        /* panic */;
-                       printk(KERN_CRIT "hfs: unable to free bnode %u. "
+                       pr_crit("unable to free bnode %u. "
                                        "bmap not found!\n",
                                node->this);
                        return;
@@ -355,7 +354,7 @@ void hfs_bmap_free(struct hfs_bnode *node)
                        return;
                if (node->type != HFS_NODE_MAP) {
                        /* panic */;
-                       printk(KERN_CRIT "hfs: invalid bmap found! "
+                       pr_crit("invalid bmap found! "
                                        "(%u,%d)\n",
                                node->this, node->type);
                        hfs_bnode_put(node);
@@ -370,7 +369,7 @@ 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 "
+               pr_crit("trying to free free bnode "
                                "%u(%d)\n",
                        node->this, node->type);
                kunmap(page);