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

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

diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
index 298d4e4..6e560d5 100644 (file)
--- a/fs/hfsplus/brec.c
+++ b/fs/hfsplus/brec.c
@@ -45,13 +45,13 @@ u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec)
                if (!recoff)
                        return 0;
                if (recoff > node->tree->node_size - 2) {
-                       printk(KERN_ERR "hfs: recoff %d too large\n", recoff);
+                       pr_err("recoff %d too large\n", recoff);
                        return 0;
                }
 
                retval = hfs_bnode_read_u16(node, recoff) + 2;
                if (retval > node->tree->max_key_len + 2) {
-                       printk(KERN_ERR "hfs: keylen %d too large\n",
+                       pr_err("keylen %d too large\n",
                                retval);
                        retval = 0;
                }
@@ -90,7 +90,7 @@ again:
        end_rec_off = tree->node_size - (node->num_recs + 1) * 2;
        end_off = hfs_bnode_read_u16(node, end_rec_off);
        end_rec_off -= 2;
-       dprint(DBG_BNODE_MOD, "insert_rec: %d, %d, %d, %d\n",
+       hfs_dbg(BNODE_MOD, "insert_rec: %d, %d, %d, %d\n",
                rec, size, end_off, end_rec_off);
        if (size > end_rec_off - end_off) {
                if (new_node)
@@ -191,7 +191,7 @@ again:
                mark_inode_dirty(tree->inode);
        }
        hfs_bnode_dump(node);
-       dprint(DBG_BNODE_MOD, "remove_rec: %d, %d\n",
+       hfs_dbg(BNODE_MOD, "remove_rec: %d, %d\n",
                fd->record, fd->keylength + fd->entrylength);
        if (!--node->num_recs) {
                hfs_bnode_unlink(node);
@@ -244,7 +244,7 @@ static struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)
        if (IS_ERR(new_node))
                return new_node;
        hfs_bnode_get(node);
-       dprint(DBG_BNODE_MOD, "split_nodes: %d - %d - %d\n",
+       hfs_dbg(BNODE_MOD, "split_nodes: %d - %d - %d\n",
                node->this, new_node->this, node->next);
        new_node->next = node->next;
        new_node->prev = node->this;
@@ -379,7 +379,7 @@ again:
                newkeylen = hfs_bnode_read_u16(node, 14) + 2;
        else
                fd->keylength = newkeylen = tree->max_key_len + 2;
-       dprint(DBG_BNODE_MOD, "update_rec: %d, %d, %d\n",
+       hfs_dbg(BNODE_MOD, "update_rec: %d, %d, %d\n",
                rec, fd->keylength, newkeylen);
 
        rec_off = tree->node_size - (rec + 2) * 2;
@@ -391,7 +391,7 @@ again:
                end_off = hfs_bnode_read_u16(parent, end_rec_off);
                if (end_rec_off - end_off < diff) {
 
-                       dprint(DBG_BNODE_MOD, "hfs: splitting index node.\n");
+                       hfs_dbg(BNODE_MOD, "splitting index node\n");
                        fd->bnode = parent;
                        new_node = hfs_bnode_split(fd);
                        if (IS_ERR(new_node))