Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b3e1f7 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

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: default avatarJoe 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 5f3726f9

fs/hfs/bfind.c

+4 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ int hfs_find_init(struct hfs_btree *tree, struct hfs_find_data *fd) 
		return -ENOMEM;

	fd->search_key = ptr;

	fd->key = ptr + tree->max_key_len + 2;

	dprint(DBG_BNODE_REFS, "find_init: %d (%p)\n", tree->cnid, __builtin_return_address(0));

	hfs_dbg(BNODE_REFS, "find_init: %d (%p)\n",

		tree->cnid, __builtin_return_address(0));

	mutex_lock(&tree->tree_lock);

	return 0;

}
@@ -31,7 +32,8 @@ void hfs_find_exit(struct hfs_find_data *fd) 
{

	hfs_bnode_put(fd->bnode);

	kfree(fd->search_key);

	dprint(DBG_BNODE_REFS, "find_exit: %d (%p)\n", fd->tree->cnid, __builtin_return_address(0));

	hfs_dbg(BNODE_REFS, "find_exit: %d (%p)\n",

		fd->tree->cnid, __builtin_return_address(0));

	mutex_unlock(&fd->tree->tree_lock);

	fd->tree = NULL;

}

fs/hfs/bitmap.c

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ u32 hfs_vbm_search_free(struct super_block *sb, u32 goal, u32 *num_bits) 
		}

	}



	dprint(DBG_BITMAP, "alloc_bits: %u,%u\n", pos, *num_bits);

	hfs_dbg(BITMAP, "alloc_bits: %u,%u\n", pos, *num_bits);

	HFS_SB(sb)->free_ablocks -= *num_bits;

	hfs_bitmap_dirty(sb);

out:
@@ -200,7 +200,7 @@ int hfs_clear_vbm_bits(struct super_block *sb, u16 start, u16 count) 
	if (!count)

		return 0;



	dprint(DBG_BITMAP, "clear_bits: %u,%u\n", start, count);

	hfs_dbg(BITMAP, "clear_bits: %u,%u\n", start, count);

	/* are all of the bits in range? */

	if ((start + count) > HFS_SB(sb)->fs_ablocks)

		return -2;

fs/hfs/bnode.c

+19 −16
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst, 
	struct hfs_btree *tree;

	struct page *src_page, *dst_page;



	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;
@@ -120,7 +120,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len) 
	struct page *page;

	void *ptr;



	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;
@@ -138,16 +138,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_cont(BNODE_MOD, " %d", key_off);

		if (i && node->type == HFS_NODE_INDEX) {

			int tmp;
@@ -155,17 +155,18 @@ void hfs_bnode_dump(struct hfs_bnode *node) 
				tmp = (hfs_bnode_read_u8(node, key_off) | 1) + 1;

			else

				tmp = node->tree->max_key_len + 1;

			dprint(DBG_BNODE_MOD, " (%d,%d", tmp, hfs_bnode_read_u8(node, key_off));

			hfs_dbg_cont(BNODE_MOD, " (%d,%d",

				     tmp, hfs_bnode_read_u8(node, key_off));

			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_u8(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)
@@ -257,7 +258,7 @@ 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",

	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);
@@ -301,7 +302,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)
@@ -443,8 +444,9 @@ void hfs_bnode_get(struct hfs_bnode *node) 
{

	if (node) {

		atomic_inc(&node->refcnt);

		dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",

		       node->tree->cnid, node->this, atomic_read(&node->refcnt));

		hfs_dbg(BNODE_REFS, "get_node(%d:%d): %d\n",

			node->tree->cnid, node->this,

			atomic_read(&node->refcnt));

	}

}
@@ -455,8 +457,9 @@ 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",

		       node->tree->cnid, node->this, atomic_read(&node->refcnt));

		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));

		if (!atomic_dec_and_lock(&node->refcnt, &tree->hash_lock))

			return;

fs/hfs/brec.c

+7 −4
Original line number Diff line number Diff line
@@ -94,7 +94,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);

	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)

			panic("not enough room!\n");
@@ -190,7 +191,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);

	hfs_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)
@@ -240,7 +242,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;
@@ -374,7 +376,8 @@ again: 
		newkeylen = (hfs_bnode_read_u8(node, 14) | 1) + 1;

	else

		fd->keylength = newkeylen = tree->max_key_len + 1;

	dprint(DBG_BNODE_MOD, "update_rec: %d, %d, %d\n", rec, fd->keylength, newkeylen);

	hfs_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;

fs/hfs/btree.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,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);

	tree = node->tree;

	nidx = node->this;

	node = hfs_bnode_find(tree, 0);