Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / fs / hfsplus / brec.c

diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
index 2f39d05443e1a374b197359f70d20337562aa9e8..2312de34bd426e0755516042881d3be31ddc33a0 100644 (file)
--- a/fs/hfsplus/brec.c
+++ b/fs/hfsplus/brec.c
@@ -39,7 +39,8 @@ u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec)
           !(node->tree->attributes & HFS_TREE_VARIDXKEYS)) {
                retval = node->tree->max_key_len + 2;
        } else {
-               recoff = hfs_bnode_read_u16(node, node->tree->node_size - (rec + 1) * 2);
+               recoff = hfs_bnode_read_u16(node,
+                       node->tree->node_size - (rec + 1) * 2);
                if (!recoff)
                        return 0;
 
@@ -84,7 +85,8 @@ 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", rec, size, end_off, end_rec_off);
+       dprint(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)
                        panic("not enough room!\n");
@@ -99,7 +101,9 @@ again:
        }
        node->num_recs++;
        /* write new last offset */
-       hfs_bnode_write_u16(node, offsetof(struct hfs_bnode_desc, num_recs), node->num_recs);
+       hfs_bnode_write_u16(node,
+               offsetof(struct hfs_bnode_desc, num_recs),
+               node->num_recs);
        hfs_bnode_write_u16(node, end_rec_off, end_off + size);
        data_off = end_off;
        data_rec_off = end_rec_off + 2;
@@ -151,7 +155,8 @@ skip:
                if (tree->attributes & HFS_TREE_VARIDXKEYS)
                        key_len = be16_to_cpu(fd->search_key->key_len) + 2;
                else {
-                       fd->search_key->key_len = cpu_to_be16(tree->max_key_len);
+                       fd->search_key->key_len =
+                               cpu_to_be16(tree->max_key_len);
                        key_len = tree->max_key_len + 2;
                }
                goto again;
@@ -180,7 +185,8 @@ again:
                mark_inode_dirty(tree->inode);
        }
        hfs_bnode_dump(node);
-       dprint(DBG_BNODE_MOD, "remove_rec: %d, %d\n", fd->record, fd->keylength + fd->entrylength);
+       dprint(DBG_BNODE_MOD, "remove_rec: %d, %d\n",
+               fd->record, fd->keylength + fd->entrylength);
        if (!--node->num_recs) {
                hfs_bnode_unlink(node);
                if (!node->parent)
@@ -194,7 +200,9 @@ again:
                __hfs_brec_find(node, fd);
                goto again;
        }
-       hfs_bnode_write_u16(node, offsetof(struct hfs_bnode_desc, num_recs), node->num_recs);
+       hfs_bnode_write_u16(node,
+               offsetof(struct hfs_bnode_desc, num_recs),
+               node->num_recs);
 
        if (rec_off == end_off)
                goto skip;
@@ -364,7 +372,8 @@ 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", rec, fd->keylength, newkeylen);
+       dprint(DBG_BNODE_MOD, "update_rec: %d, %d, %d\n",
+               rec, fd->keylength, newkeylen);
 
        rec_off = tree->node_size - (rec + 2) * 2;
        end_rec_off = tree->node_size - (parent->num_recs + 1) * 2;
@@ -375,7 +384,7 @@ again:
                end_off = hfs_bnode_read_u16(parent, end_rec_off);
                if (end_rec_off - end_off < diff) {
 
-                       printk(KERN_DEBUG "hfs: splitting index node...\n");
+                       dprint(DBG_BNODE_MOD, "hfs: splitting index node.\n");
                        fd->bnode = parent;
                        new_node = hfs_bnode_split(fd);
                        if (IS_ERR(new_node))
@@ -383,7 +392,8 @@ again:
                        parent = fd->bnode;
                        rec = fd->record;
                        rec_off = tree->node_size - (rec + 2) * 2;
-                       end_rec_off = tree->node_size - (parent->num_recs + 1) * 2;
+                       end_rec_off = tree->node_size -
+                               (parent->num_recs + 1) * 2;
                }
        }