aboutsummaryrefslogtreecommitdiffstats
path: root/fs/hfsplus/brec.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2013-04-30 18:27:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-30 20:04:05 -0400
commitc2b3e1f76e5c90215bc7f740b376c0220eb8a8e3 (patch)
tree4ffbb3029d06909e05621ebb96b66052640f3ff7 /fs/hfsplus/brec.c
parent5f3726f9457d5a863721353786e3395cdbd0f943 (diff)
hfs/hfsplus: convert dprint to hfs_dbg
Use a more current logging style. Rename macro and uses. Add do {} while (0) to macro. Add DBG_ to macro. Add and use hfs_dbg_cont variant where appropriate. 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>
Diffstat (limited to 'fs/hfsplus/brec.c')
-rw-r--r--fs/hfsplus/brec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
index 298d4e45604b..e238ba8cce26 100644
--- a/fs/hfsplus/brec.c
+++ b/fs/hfsplus/brec.c
@@ -90,7 +90,7 @@ again:
90 end_rec_off = tree->node_size - (node->num_recs + 1) * 2; 90 end_rec_off = tree->node_size - (node->num_recs + 1) * 2;
91 end_off = hfs_bnode_read_u16(node, end_rec_off); 91 end_off = hfs_bnode_read_u16(node, end_rec_off);
92 end_rec_off -= 2; 92 end_rec_off -= 2;
93 dprint(DBG_BNODE_MOD, "insert_rec: %d, %d, %d, %d\n", 93 hfs_dbg(BNODE_MOD, "insert_rec: %d, %d, %d, %d\n",
94 rec, size, end_off, end_rec_off); 94 rec, size, end_off, end_rec_off);
95 if (size > end_rec_off - end_off) { 95 if (size > end_rec_off - end_off) {
96 if (new_node) 96 if (new_node)
@@ -191,7 +191,7 @@ again:
191 mark_inode_dirty(tree->inode); 191 mark_inode_dirty(tree->inode);
192 } 192 }
193 hfs_bnode_dump(node); 193 hfs_bnode_dump(node);
194 dprint(DBG_BNODE_MOD, "remove_rec: %d, %d\n", 194 hfs_dbg(BNODE_MOD, "remove_rec: %d, %d\n",
195 fd->record, fd->keylength + fd->entrylength); 195 fd->record, fd->keylength + fd->entrylength);
196 if (!--node->num_recs) { 196 if (!--node->num_recs) {
197 hfs_bnode_unlink(node); 197 hfs_bnode_unlink(node);
@@ -244,7 +244,7 @@ static struct hfs_bnode *hfs_bnode_split(struct hfs_find_data *fd)
244 if (IS_ERR(new_node)) 244 if (IS_ERR(new_node))
245 return new_node; 245 return new_node;
246 hfs_bnode_get(node); 246 hfs_bnode_get(node);
247 dprint(DBG_BNODE_MOD, "split_nodes: %d - %d - %d\n", 247 hfs_dbg(BNODE_MOD, "split_nodes: %d - %d - %d\n",
248 node->this, new_node->this, node->next); 248 node->this, new_node->this, node->next);
249 new_node->next = node->next; 249 new_node->next = node->next;
250 new_node->prev = node->this; 250 new_node->prev = node->this;
@@ -379,7 +379,7 @@ again:
379 newkeylen = hfs_bnode_read_u16(node, 14) + 2; 379 newkeylen = hfs_bnode_read_u16(node, 14) + 2;
380 else 380 else
381 fd->keylength = newkeylen = tree->max_key_len + 2; 381 fd->keylength = newkeylen = tree->max_key_len + 2;
382 dprint(DBG_BNODE_MOD, "update_rec: %d, %d, %d\n", 382 hfs_dbg(BNODE_MOD, "update_rec: %d, %d, %d\n",
383 rec, fd->keylength, newkeylen); 383 rec, fd->keylength, newkeylen);
384 384
385 rec_off = tree->node_size - (rec + 2) * 2; 385 rec_off = tree->node_size - (rec + 2) * 2;
@@ -391,7 +391,7 @@ again:
391 end_off = hfs_bnode_read_u16(parent, end_rec_off); 391 end_off = hfs_bnode_read_u16(parent, end_rec_off);
392 if (end_rec_off - end_off < diff) { 392 if (end_rec_off - end_off < diff) {
393 393
394 dprint(DBG_BNODE_MOD, "hfs: splitting index node.\n"); 394 hfs_dbg(BNODE_MOD, "splitting index node\n");
395 fd->bnode = parent; 395 fd->bnode = parent;
396 new_node = hfs_bnode_split(fd); 396 new_node = hfs_bnode_split(fd);
397 if (IS_ERR(new_node)) 397 if (IS_ERR(new_node))