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

Commit 634725a9 authored by Roman Zippel's avatar Roman Zippel Committed by Linus Torvalds
Browse files

[PATCH] hfs: cleanup HFS+ prints 



Add the log level and a "hfs: " prefix to all kernel prints.  (HFS and HFS+
will use the same prefix, as they share some code and could be merged at some
point.)

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5131cf15

fs/hfsplus/bfind.c

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ int __hfs_brec_find(struct hfs_bnode *bnode, struct hfs_find_data *fd) 
		else

			e = rec - 1;

	} while (b <= e);

	//printk("%d: %d,%d,%d\n", bnode->this, b, e, rec);

	if (rec != e && e >= 0) {

		len = hfs_brec_lenoff(bnode, e, &off);

		keylen = hfs_brec_keylen(bnode, e);
@@ -127,7 +126,7 @@ int hfs_brec_find(struct hfs_find_data *fd) 
	return res;



invalid:

	printk("HFS+-fs: inconsistency in B*Tree (%d,%d,%d,%u,%u)\n",

	printk(KERN_ERR "hfs: inconsistency in B*Tree (%d,%d,%d,%u,%u)\n",

		height, bnode->height, bnode->type, nidx, parent);

	res = -EIO;

release:

fs/hfsplus/bnode.c

+6 −5
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ void hfs_bnode_unlink(struct hfs_bnode *node) 


	// move down?

	if (!node->prev && !node->next) {

		printk("hfs_btree_del_level\n");

		printk(KERN_DEBUG "hfs_btree_del_level\n");

	}

	if (!node->parent) {

		tree->root = 0;
@@ -379,7 +379,7 @@ struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid) 
	struct hfs_bnode *node;



	if (cnid >= tree->node_count) {

		printk("HFS+-fs: request for non-existent node %d in B*Tree\n", cnid);

		printk(KERN_ERR "hfs: request for non-existent node %d in B*Tree\n", cnid);

		return NULL;

	}
@@ -402,7 +402,7 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) 
	loff_t off;



	if (cnid >= tree->node_count) {

		printk("HFS+-fs: request for non-existent node %d in B*Tree\n", cnid);

		printk(KERN_ERR "hfs: request for non-existent node %d in B*Tree\n", cnid);

		return NULL;

	}
@@ -576,8 +576,9 @@ struct hfs_bnode *hfs_bnode_create(struct hfs_btree *tree, u32 num) 
	node = hfs_bnode_findhash(tree, num);

	spin_unlock(&tree->hash_lock);

	if (node) {

		printk("new node %u already hashed?\n", num);

		BUG();

		printk(KERN_CRIT "new node %u already hashed?\n", num);

		WARN_ON(1);

		return node;

	}

	node = __hfs_bnode_create(tree, num);

	if (!node)

fs/hfsplus/brec.c

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int hfs_brec_update_parent(struct hfs_find_data *fd) 
		end_off = hfs_bnode_read_u16(parent, end_rec_off);

		if (end_rec_off - end_off < diff) {



			printk("splitting index node...\n");

			printk(KERN_DEBUG "hfs: splitting index node...\n");

			fd->bnode = parent;

			new_node = hfs_bnode_split(fd);

			if (IS_ERR(new_node))

fs/hfsplus/btree.c

+6 −10
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id) 
	} else if (id == HFSPLUS_CAT_CNID) {

		tree->keycmp = hfsplus_cat_cmp_key;

	} else {

		printk("HFS+-fs: unknown B*Tree requested\n");

		printk(KERN_ERR "hfs: unknown B*Tree requested\n");

		goto free_tree;

	}

	tree->inode = iget(sb, id);
@@ -99,7 +99,7 @@ void hfs_btree_close(struct hfs_btree *tree) 
		while ((node = tree->node_hash[i])) {

			tree->node_hash[i] = node->next_hash;

			if (atomic_read(&node->refcnt))

				printk("HFS+: node %d:%d still has %d user(s)!\n",

				printk(KERN_CRIT "hfs: node %d:%d still has %d user(s)!\n",

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

			hfs_bnode_free(node);

			tree->node_hash_cnt--;
@@ -223,10 +223,6 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) 
						tree->free_nodes--;

						mark_inode_dirty(tree->inode);

						hfs_bnode_put(node);

						if (!idx) {

							printk("unexpected idx %u (%u)\n", idx, node->this);

							BUG();

						}

						return hfs_bnode_create(tree, idx);

					}

				}
@@ -242,7 +238,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree) 
		kunmap(*pagep);

		nidx = node->next;

		if (!nidx) {

			printk("create new bmap node...\n");

			printk(KERN_DEBUG "hfs: create new bmap node...\n");

			next_node = hfs_bmap_new_bmap(node, idx);

		} else

			next_node = hfs_bnode_find(tree, nidx);
@@ -284,7 +280,7 @@ void hfs_bmap_free(struct hfs_bnode *node) 
		hfs_bnode_put(node);

		if (!i) {

			/* panic */;

			printk("HFS: unable to free bnode %u. bmap not found!\n", node->this);

			printk(KERN_CRIT "hfs: unable to free bnode %u. bmap not found!\n", node->this);

			return;

		}

		node = hfs_bnode_find(tree, i);
@@ -292,7 +288,7 @@ void hfs_bmap_free(struct hfs_bnode *node) 
			return;

		if (node->type != HFS_NODE_MAP) {

			/* panic */;

			printk("HFS: invalid bmap found! (%u,%d)\n", node->this, node->type);

			printk(KERN_CRIT "hfs: invalid bmap found! (%u,%d)\n", node->this, node->type);

			hfs_bnode_put(node);

			return;

		}
@@ -305,7 +301,7 @@ void hfs_bmap_free(struct hfs_bnode *node) 
	m = 1 << (~nidx & 7);

	byte = data[off];

	if (!(byte & m)) {

		printk("HFS: trying to free free bnode %u(%d)\n", node->this, node->type);

		printk(KERN_CRIT "hfs: trying to free free bnode %u(%d)\n", node->this, node->type);

		kunmap(page);

		hfs_bnode_put(node);

		return;

fs/hfsplus/catalog.c

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int hfsplus_find_cat(struct super_block *sb, u32 cnid, 


	type = be16_to_cpu(tmp.type);

	if (type != HFSPLUS_FOLDER_THREAD && type != HFSPLUS_FILE_THREAD) {

		printk("HFS+-fs: Found bad thread record in catalog\n");

		printk(KERN_ERR "hfs: found bad thread record in catalog\n");

		return -EIO;

	}