Merge tag 'for-3.10-rc1' of git://gitorious.org/linux-pwm/linux-pwm

[firefly-linux-kernel-4.4.55.git] / fs / hfsplus / bnode.c

diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
index f31ac6f404f1d3f4ee5af4de4c0db4b958916001..11c860204520d37a8bbc2250cd723bb64b52b0c8 100644 (file)
--- a/fs/hfsplus/bnode.c
+++ b/fs/hfsplus/bnode.c
@@ -130,7 +130,7 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,
        struct page **src_page, **dst_page;
        int l;
 
-       dprint(DBG_BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len);
+       hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len);
        if (!len)
                return;
        tree = src_node->tree;
@@ -188,7 +188,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)
        struct page **src_page, **dst_page;
        int l;
 
-       dprint(DBG_BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len);
+       hfs_dbg(BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len);
        if (!len)
                return;
        src += node->page_offset;
@@ -302,16 +302,16 @@ void hfs_bnode_dump(struct hfs_bnode *node)
        __be32 cnid;
        int i, off, key_off;
 
-       dprint(DBG_BNODE_MOD, "bnode: %d\n", node->this);
+       hfs_dbg(BNODE_MOD, "bnode: %d\n", node->this);
        hfs_bnode_read(node, &desc, 0, sizeof(desc));
-       dprint(DBG_BNODE_MOD, "%d, %d, %d, %d, %d\n",
+       hfs_dbg(BNODE_MOD, "%d, %d, %d, %d, %d\n",
                be32_to_cpu(desc.next), be32_to_cpu(desc.prev),
                desc.type, desc.height, be16_to_cpu(desc.num_recs));
 
        off = node->tree->node_size - 2;
        for (i = be16_to_cpu(desc.num_recs); i >= 0; off -= 2, i--) {
                key_off = hfs_bnode_read_u16(node, off);
-               dprint(DBG_BNODE_MOD, " %d", key_off);
+               hfs_dbg(BNODE_MOD, " %d", key_off);
                if (i && node->type == HFS_NODE_INDEX) {
                        int tmp;
 
@@ -320,17 +320,17 @@ void hfs_bnode_dump(struct hfs_bnode *node)
                                tmp = hfs_bnode_read_u16(node, key_off) + 2;
                        else
                                tmp = node->tree->max_key_len + 2;
-                       dprint(DBG_BNODE_MOD, " (%d", tmp);
+                       hfs_dbg_cont(BNODE_MOD, " (%d", tmp);
                        hfs_bnode_read(node, &cnid, key_off + tmp, 4);
-                       dprint(DBG_BNODE_MOD, ",%d)", be32_to_cpu(cnid));
+                       hfs_dbg_cont(BNODE_MOD, ",%d)", be32_to_cpu(cnid));
                } else if (i && node->type == HFS_NODE_LEAF) {
                        int tmp;
 
                        tmp = hfs_bnode_read_u16(node, key_off);
-                       dprint(DBG_BNODE_MOD, " (%d)", tmp);
+                       hfs_dbg_cont(BNODE_MOD, " (%d)", tmp);
                }
        }
-       dprint(DBG_BNODE_MOD, "\n");
+       hfs_dbg_cont(BNODE_MOD, "\n");
 }
 
 void hfs_bnode_unlink(struct hfs_bnode *node)
@@ -366,7 +366,7 @@ void hfs_bnode_unlink(struct hfs_bnode *node)
 
        /* move down? */
        if (!node->prev && !node->next)
-               dprint(DBG_BNODE_MOD, "hfs_btree_del_level\n");
+               hfs_dbg(BNODE_MOD, "hfs_btree_del_level\n");
        if (!node->parent) {
                tree->root = 0;
                tree->depth = 0;
@@ -386,7 +386,7 @@ struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid)
        struct hfs_bnode *node;
 
        if (cnid >= tree->node_count) {
-               printk(KERN_ERR "hfs: request for non-existent node "
+               pr_err("request for non-existent node "
                                "%d in B*Tree\n",
                        cnid);
                return NULL;
@@ -409,7 +409,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
        loff_t off;
 
        if (cnid >= tree->node_count) {
-               printk(KERN_ERR "hfs: request for non-existent node "
+               pr_err("request for non-existent node "
                                "%d in B*Tree\n",
                        cnid);
                return NULL;
@@ -425,8 +425,8 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid)
        node->this = cnid;
        set_bit(HFS_BNODE_NEW, &node->flags);
        atomic_set(&node->refcnt, 1);
-       dprint(DBG_BNODE_REFS, "new_node(%d:%d): 1\n",
-              node->tree->cnid, node->this);
+       hfs_dbg(BNODE_REFS, "new_node(%d:%d): 1\n",
+               node->tree->cnid, node->this);
        init_waitqueue_head(&node->lock_wq);
        spin_lock(&tree->hash_lock);
        node2 = hfs_bnode_findhash(tree, cnid);
@@ -470,7 +470,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)
 {
        struct hfs_bnode **p;
 
-       dprint(DBG_BNODE_REFS, "remove_node(%d:%d): %d\n",
+       hfs_dbg(BNODE_REFS, "remove_node(%d:%d): %d\n",
                node->tree->cnid, node->this, atomic_read(&node->refcnt));
        for (p = &node->tree->node_hash[hfs_bnode_hash(node->this)];
             *p && *p != node; p = &(*p)->next_hash)
@@ -588,7 +588,7 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num)
        node = hfs_bnode_findhash(tree, num);
        spin_unlock(&tree->hash_lock);
        if (node) {
-               printk(KERN_CRIT "new node %u already hashed?\n", num);
+               pr_crit("new node %u already hashed?\n", num);
                WARN_ON(1);
                return node;
        }
@@ -620,7 +620,7 @@ void hfs_bnode_get(struct hfs_bnode *node)
 {
        if (node) {
                atomic_inc(&node->refcnt);
-               dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
+               hfs_dbg(BNODE_REFS, "get_node(%d:%d): %d\n",
                        node->tree->cnid, node->this,
                        atomic_read(&node->refcnt));
        }
@@ -633,7 +633,7 @@ void hfs_bnode_put(struct hfs_bnode *node)
                struct hfs_btree *tree = node->tree;
                int i;
 
-               dprint(DBG_BNODE_REFS, "put_node(%d:%d): %d\n",
+               hfs_dbg(BNODE_REFS, "put_node(%d:%d): %d\n",
                        node->tree->cnid, node->this,
                        atomic_read(&node->refcnt));
                BUG_ON(!atomic_read(&node->refcnt));