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

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

hfs/hfsplus: convert printks to pr_<level> 



Use a more current logging style.

Add #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
hfsplus now uses "hfsplus: " for all messages.
Coalesce formats.
Prefix debugging messages too.

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 c2b3e1f7

fs/hfs/bfind.c

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ int hfs_brec_find(struct hfs_find_data *fd) 
	return res;



invalid:

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

	pr_err("inconsistency in B*Tree (%d,%d,%d,%u,%u)\n",

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

	res = -EIO;

release:

fs/hfs/bnode.c

+2 −2
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ struct hfs_bnode *hfs_bnode_findhash(struct hfs_btree *tree, u32 cnid) 
	struct hfs_bnode *node;



	if (cnid >= tree->node_count) {

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

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

		return NULL;

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



	if (cnid >= tree->node_count) {

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

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

		return NULL;

	}

fs/hfs/brec.c

+3 −5
Original line number Diff line number Diff line
@@ -47,15 +47,13 @@ u16 hfs_brec_keylen(struct hfs_bnode *node, u16 rec) 
		if (node->tree->attributes & HFS_TREE_BIGKEYS) {

			retval = hfs_bnode_read_u16(node, recoff) + 2;

			if (retval > node->tree->max_key_len + 2) {

				printk(KERN_ERR "hfs: keylen %d too large\n",

					retval);

				pr_err("keylen %d too large\n", retval);

				retval = 0;

			}

		} else {

			retval = (hfs_bnode_read_u8(node, recoff) | 1) + 1;

			if (retval > node->tree->max_key_len + 1) {

				printk(KERN_ERR "hfs: keylen %d too large\n",

					retval);

				pr_err("keylen %d too large\n", retval);

				retval = 0;

			}

		}
@@ -388,7 +386,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(KERN_DEBUG "hfs: splitting index node...\n");

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

			fd->bnode = parent;

			new_node = hfs_bnode_split(fd);

			if (IS_ERR(new_node))

fs/hfs/btree.c

+16 −13
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke 
				    mdb->drXTFlSize, be32_to_cpu(mdb->drXTClpSiz));

		if (HFS_I(tree->inode)->alloc_blocks >

					HFS_I(tree->inode)->first_blocks) {

			printk(KERN_ERR "hfs: invalid btree extent records\n");

			pr_err("invalid btree extent records\n");

			unlock_new_inode(tree->inode);

			goto free_inode;

		}
@@ -60,8 +60,7 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke 
				    mdb->drCTFlSize, be32_to_cpu(mdb->drCTClpSiz));



		if (!HFS_I(tree->inode)->first_blocks) {

			printk(KERN_ERR "hfs: invalid btree extent records "

								"(0 size).\n");

			pr_err("invalid btree extent records (0 size)\n");

			unlock_new_inode(tree->inode);

			goto free_inode;

		}
@@ -100,14 +99,14 @@ struct hfs_btree *hfs_btree_open(struct super_block *sb, u32 id, btree_keycmp ke 
	switch (id) {

	case HFS_EXT_CNID:

		if (tree->max_key_len != HFS_MAX_EXT_KEYLEN) {

			printk(KERN_ERR "hfs: invalid extent max_key_len %d\n",

			pr_err("invalid extent max_key_len %d\n",

			       tree->max_key_len);

			goto fail_page;

		}

		break;

	case HFS_CAT_CNID:

		if (tree->max_key_len != HFS_MAX_CAT_KEYLEN) {

			printk(KERN_ERR "hfs: invalid catalog max_key_len %d\n",

			pr_err("invalid catalog max_key_len %d\n",

			       tree->max_key_len);

			goto fail_page;

		}
@@ -146,8 +145,9 @@ 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(KERN_ERR "hfs: node %d:%d still has %d user(s)!\n",

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

				pr_err("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--;

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

		nidx = node->next;

		if (!nidx) {

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

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

			next_node = hfs_bmap_new_bmap(node, idx);

		} else

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

		if (!i) {

			/* panic */;

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

			pr_crit("unable to free bnode %u. bmap not found!\n",

				node->this);

			return;

		}

		node = hfs_bnode_find(tree, i);
@@ -339,7 +340,8 @@ void hfs_bmap_free(struct hfs_bnode *node) 
			return;

		if (node->type != HFS_NODE_MAP) {

			/* panic */;

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

			pr_crit("invalid bmap found! (%u,%d)\n",

				node->this, node->type);

			hfs_bnode_put(node);

			return;

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

	byte = data[off];

	if (!(byte & m)) {

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

		pr_crit("trying to free free bnode %u(%d)\n",

			node->this, node->type);

		kunmap(page);

		hfs_bnode_put(node);

		return;

fs/hfs/catalog.c

+2 −2
Original line number Diff line number Diff line
@@ -187,14 +187,14 @@ int hfs_cat_find_brec(struct super_block *sb, u32 cnid, 


	type = rec.type;

	if (type != HFS_CDR_THD && type != HFS_CDR_FTH) {

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

		pr_err("found bad thread record in catalog\n");

		return -EIO;

	}



	fd->search_key->cat.ParID = rec.thread.ParID;

	len = fd->search_key->cat.CName.len = rec.thread.CName.len;

	if (len > HFS_NAMELEN) {

		printk(KERN_ERR "hfs: bad catalog namelength\n");

		pr_err("bad catalog namelength\n");

		return -EIO;

	}

	memcpy(fd->search_key->cat.CName.name, rec.thread.CName.name, len);