Commit f32a26fa authored by Viacheslav Dubeyko's avatar Viacheslav Dubeyko
Browse files

hfs/hfsplus: rework debug output subsystem 



Currently, HFS/HFS+ has very obsolete and inconvenient
debug output subsystem. Also, the code is duplicated
in HFS and HFS+ driver. This patch introduces
linux/hfs_common.h for gathering common declarations,
inline functions, and common short methods. Currently,
this file contains only hfs_dbg() function that
employs pr_debug() with the goal to print a debug-level
messages conditionally.

So, now, it is possible to enable the debug output
by means of:

echo 'file extent.c +p' > /proc/dynamic_debug/control
echo 'func hfsplus_evict_inode +p' > /proc/dynamic_debug/control

And debug output looks like this:

hfs: pid 5831:fs/hfs/catalog.c:228 hfs_cat_delete(): delete_cat: 00,48
hfs: pid 5831:fs/hfs/extent.c:484 hfs_file_truncate(): truncate: 48, 409600 -> 0
hfs: pid 5831:fs/hfs/extent.c:212 hfs_dump_extent():
hfs: pid 5831:fs/hfs/extent.c:214 hfs_dump_extent():  78:4
hfs: pid 5831:fs/hfs/extent.c:214 hfs_dump_extent():  0:0
hfs: pid 5831:fs/hfs/extent.c:214 hfs_dump_extent():  0:0

v4
Debug messages have been reworked and information about
new HFS/HFS+ shared declarations file has been added
to MAINTAINERS file.

v5
Yangtao Li suggested to clean up debug output and
fix several typos.

Signed-off-by: default avatarViacheslav Dubeyko <slava@dubeyko.com>
cc: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
cc: Yangtao Li <frank.li@vivo.com>
cc: linux-fsdevel@vger.kernel.org
cc: Johannes Thumshirn <Johannes.Thumshirn@wdc.com>
Signed-off-by: default avatarViacheslav Dubeyko <slava@dubeyko.com>
parent 42520df6

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -10794,6 +10794,7 @@ S: Maintained 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vdubeyko/hfs.git

F:	Documentation/filesystems/hfs.rst

F:	fs/hfs/

F:	include/linux/hfs_common.h









HFSPLUS FILESYSTEM









M:	Viacheslav Dubeyko <slava@dubeyko.com>








@@ -10804,6 +10805,7 @@ S:	Maintained







T:	git git://git.kernel.org/pub/scm/linux/kernel/git/vdubeyko/hfs.git









F:	Documentation/filesystems/hfsplus.rst









F:	fs/hfsplus/









F:	include/linux/hfs_common.h

















HGA FRAMEBUFFER DRIVER









M:	Ferenc Bakonyi <fero@drama.obuda.kando.hu>
































fs/hfs/bfind.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -26,7 +26,7 @@ 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;









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









	hfs_dbg("cnid %d, caller %ps\n",









		tree->cnid, __builtin_return_address(0));









	switch (tree->cnid) {









	case HFS_CAT_CNID:








@@ -48,7 +48,7 @@ void hfs_find_exit(struct hfs_find_data *fd)







{









	hfs_bnode_put(fd->bnode);









	kfree(fd->search_key);









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









	hfs_dbg("cnid %d, caller %ps\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)







		}









	}



















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









	hfs_dbg("pos %u, num_bits %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;



















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









	hfs_dbg("start %u, count %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



+14
−14






























Original line number
Diff line number
Diff line







@@ -200,7 +200,7 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,







{









	struct page *src_page, *dst_page;



















	hfs_dbg(BNODE_MOD, "copybytes: %u,%u,%u\n", dst, src, len);









	hfs_dbg("dst %u, src %u, len %u\n", dst, src, len);









	if (!len)









		return;


















@@ -221,7 +221,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)







	struct page *page;









	void *ptr;



















	hfs_dbg(BNODE_MOD, "movebytes: %u,%u,%u\n", dst, src, len);









	hfs_dbg("dst %u, src %u, len %u\n", dst, src, len);









	if (!len)









		return;


















@@ -243,16 +243,16 @@ void hfs_bnode_dump(struct hfs_bnode *node)







	__be32 cnid;









	int i, off, key_off;



















	hfs_dbg(BNODE_MOD, "bnode: %d\n", node->this);









	hfs_dbg("node %d\n", node->this);









	hfs_bnode_read(node, &desc, 0, sizeof(desc));









	hfs_dbg(BNODE_MOD, "%d, %d, %d, %d, %d\n",









	hfs_dbg("next %d, prev %d, type %d, height %d, num_recs %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);









		hfs_dbg_cont(BNODE_MOD, " %d", key_off);









		hfs_dbg(" key_off %d", key_off);









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









			int tmp;


















@@ -260,18 +260,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;









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









			hfs_dbg(" (%d,%d",









				tmp, hfs_bnode_read_u8(node, key_off));









			hfs_bnode_read(node, &cnid, key_off + tmp, 4);









			hfs_dbg_cont(BNODE_MOD, ",%d)", be32_to_cpu(cnid));









			hfs_dbg(", cnid %d)", be32_to_cpu(cnid));









		} else if (i && node->type == HFS_NODE_LEAF) {









			int tmp;



















			tmp = hfs_bnode_read_u8(node, key_off);









			hfs_dbg_cont(BNODE_MOD, " (%d)", tmp);









			hfs_dbg(" (%d)", tmp);









		}









	}









	hfs_dbg_cont(BNODE_MOD, "\n");









	hfs_dbg("\n");









}



















void hfs_bnode_unlink(struct hfs_bnode *node)








@@ -361,7 +361,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);









	hfs_dbg(BNODE_REFS, "new_node(%d:%d): 1\n",









	hfs_dbg("cnid %d, node %d, refcnt 1\n",









		node->tree->cnid, node->this);









	init_waitqueue_head(&node->lock_wq);









	spin_lock(&tree->hash_lock);








@@ -401,7 +401,7 @@ void hfs_bnode_unhash(struct hfs_bnode *node)







{









	struct hfs_bnode **p;



















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









	hfs_dbg("cnid %d, node %d, refcnt %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)








@@ -546,7 +546,7 @@ void hfs_bnode_get(struct hfs_bnode *node)







{









	if (node) {









		atomic_inc(&node->refcnt);









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









		hfs_dbg("cnid %d, node %d, refcnt %d\n",









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









			atomic_read(&node->refcnt));









	}








@@ -559,7 +559,7 @@ void hfs_bnode_put(struct hfs_bnode *node)







		struct hfs_btree *tree = node->tree;









		int i;



















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









		hfs_dbg("cnid %d, node %d, refcnt %d\n",









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









			atomic_read(&node->refcnt));









		BUG_ON(!atomic_read(&node->refcnt));
































fs/hfs/brec.c



+4
−4






























Original line number
Diff line number
Diff line







@@ -94,7 +94,7 @@ int hfs_brec_insert(struct hfs_find_data *fd, void *entry, int entry_len)







	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;









	hfs_dbg(BNODE_MOD, "insert_rec: %d, %d, %d, %d\n",









	hfs_dbg("rec %d, size %d, end_off %d, end_rec_off %d\n",









		rec, size, end_off, end_rec_off);









	if (size > end_rec_off - end_off) {









		if (new_node)








@@ -192,7 +192,7 @@ int hfs_brec_remove(struct hfs_find_data *fd)







		mark_inode_dirty(tree->inode);









	}









	hfs_bnode_dump(node);









	hfs_dbg(BNODE_MOD, "remove_rec: %d, %d\n",









	hfs_dbg("rec %d, len %d\n",









		fd->record, fd->keylength + fd->entrylength);









	if (!--node->num_recs) {









		hfs_bnode_unlink(node);








@@ -261,7 +261,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);









	hfs_dbg(BNODE_MOD, "split_nodes: %d - %d - %d\n",









	hfs_dbg("this %d, new %d, next %d\n",









		node->this, new_node->this, node->next);









	new_node->next = node->next;









	new_node->prev = node->this;








@@ -397,7 +397,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd)







		newkeylen = (hfs_bnode_read_u8(node, 14) | 1) + 1;









	else









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









	hfs_dbg(BNODE_MOD, "update_rec: %d, %d, %d\n",









	hfs_dbg("rec %d, keylength %d, newkeylen %d\n",









		rec, fd->keylength, newkeylen);



















	rec_off = tree->node_size - (rec + 2) * 2;