Re: [PATCH 1/2] hfs/hfsplus: Convert dprint to hfs_dbg

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, 2013-04-08 at 09:37 -0700, Joe Perches wrote:
> 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.
> 

I think that if we begin to modify messages subsystem then it makes
sense to fix all warnings:

WARNING: %Ld/%Lu are not-standard C, use %lld/%llu
#361: FILE: fs/hfs/extent.c:464:
+	hfs_dbg(INODE, "truncate: %lu, %Lu -> %Lu\n",

WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...
#380: FILE: fs/hfs/hfs_fs.h:40:
+		printk(KERN_DEBUG fmt, ##__VA_ARGS__);	\

WARNING: Prefer netdev_cont(netdev, ... then dev_cont(dev, ... then pr_cont(...  to printk(KERN_CONT ...
#386: FILE: fs/hfs/hfs_fs.h:46:
+		printk(KERN_CONT fmt, ##__VA_ARGS__);	\

WARNING: Prefer netdev_dbg(netdev, ... then dev_dbg(dev, ... then pr_debug(...  to printk(KERN_DEBUG ...
#835: FILE: fs/hfsplus/hfsplus_fs.h:38:
+		printk(KERN_DEBUG fmt, ##__VA_ARGS__);	\

WARNING: Prefer netdev_cont(netdev, ... then dev_cont(dev, ... then pr_cont(...  to printk(KERN_CONT ...
#841: FILE: fs/hfsplus/hfsplus_fs.h:44:
+		printk(KERN_CONT fmt, ##__VA_ARGS__);	\

total: 0 errors, 5 warnings, 674 lines checked

> Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
> ---
>  fs/hfs/bfind.c          |  6 ++++--
>  fs/hfs/bitmap.c         |  4 ++--
>  fs/hfs/bnode.c          | 35 +++++++++++++++++++----------------
>  fs/hfs/brec.c           | 11 +++++++----
>  fs/hfs/btree.c          |  2 +-
>  fs/hfs/catalog.c        |  8 +++++---
>  fs/hfs/extent.c         | 20 +++++++++++---------
>  fs/hfs/hfs_fs.h         | 14 ++++++++++++--
>  fs/hfs/inode.c          |  4 ++--
>  fs/hfsplus/attributes.c |  8 ++++----
>  fs/hfsplus/bfind.c      |  4 ++--
>  fs/hfsplus/bitmap.c     | 10 +++++-----
>  fs/hfsplus/bnode.c      | 30 +++++++++++++++---------------
>  fs/hfsplus/brec.c       | 10 +++++-----
>  fs/hfsplus/btree.c      |  4 ++--
>  fs/hfsplus/catalog.c    |  7 +++----
>  fs/hfsplus/extents.c    | 26 +++++++++++++-------------
>  fs/hfsplus/hfsplus_fs.h | 14 +++++++++++---
>  fs/hfsplus/super.c      |  8 ++++----
>  19 files changed, 127 insertions(+), 98 deletions(-)
> 
> diff --git a/fs/hfs/bfind.c b/fs/hfs/bfind.c
> index 571abe9..e928f6c 100644
> --- a/fs/hfs/bfind.c
> +++ b/fs/hfs/bfind.c
> @@ -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));


I think that changing DBG_BNODE_REFS on BNODE_REFS (and so on) is not
very good idea, from my point of view. Because it can be a basis for
some ambiguity and misunderstanding (during a search for example). I
understand that we reduce constant in length. But I doubt that this
changing makes sense.

Thanks,
Vyacheslav Dubeyko.

> +	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;
>  }
> diff --git a/fs/hfs/bitmap.c b/fs/hfs/bitmap.c
> index c6e9736..28307bc 100644
> --- a/fs/hfs/bitmap.c
> +++ b/fs/hfs/bitmap.c
> @@ -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;
> diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c
> index cdb41a1..8693919 100644
> --- a/fs/hfs/bnode.c
> +++ b/fs/hfs/bnode.c
> @@ -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,8 +258,8 @@ 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",
> -	       node->tree->cnid, node->this);
> +	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);
>  	node2 = hfs_bnode_findhash(tree, cnid);
> @@ -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;
> diff --git a/fs/hfs/brec.c b/fs/hfs/brec.c
> index 92fb358..5764257 100644
> --- a/fs/hfs/brec.c
> +++ b/fs/hfs/brec.c
> @@ -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;
> diff --git a/fs/hfs/btree.c b/fs/hfs/btree.c
> index 1cbdeea..07d94ce 100644
> --- a/fs/hfs/btree.c
> +++ b/fs/hfs/btree.c
> @@ -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);
> diff --git a/fs/hfs/catalog.c b/fs/hfs/catalog.c
> index 424b033..76cfb17 100644
> --- a/fs/hfs/catalog.c
> +++ b/fs/hfs/catalog.c
> @@ -87,7 +87,8 @@ int hfs_cat_create(u32 cnid, struct inode *dir, struct qstr *str, struct inode *
>  	int entry_size;
>  	int err;
>  
> -	dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n", str->name, cnid, inode->i_nlink);
> +	hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",
> +		str->name, cnid, inode->i_nlink);
>  	if (dir->i_size >= HFS_MAX_VALENCE)
>  		return -ENOSPC;
>  
> @@ -212,7 +213,7 @@ int hfs_cat_delete(u32 cnid, struct inode *dir, struct qstr *str)
>  	struct list_head *pos;
>  	int res, type;
>  
> -	dprint(DBG_CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
> +	hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
>  	sb = dir->i_sb;
>  	hfs_find_init(HFS_SB(sb)->cat_tree, &fd);
>  
> @@ -278,7 +279,8 @@ int hfs_cat_move(u32 cnid, struct inode *src_dir, struct qstr *src_name,
>  	int entry_size, type;
>  	int err;
>  
> -	dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n", cnid, src_dir->i_ino, src_name->name,
> +	hfs_dbg(CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
> +		cnid, src_dir->i_ino, src_name->name,
>  		dst_dir->i_ino, dst_name->name);
>  	sb = src_dir->i_sb;
>  	hfs_find_init(HFS_SB(sb)->cat_tree, &src_fd);
> diff --git a/fs/hfs/extent.c b/fs/hfs/extent.c
> index a67955a..6e63a4d 100644
> --- a/fs/hfs/extent.c
> +++ b/fs/hfs/extent.c
> @@ -195,11 +195,12 @@ static void hfs_dump_extent(struct hfs_extent *extent)
>  {
>  	int i;
>  
> -	dprint(DBG_EXTENT, "   ");
> +	hfs_dbg(EXTENT, "   ");
>  	for (i = 0; i < 3; i++)
> -		dprint(DBG_EXTENT, " %u:%u", be16_to_cpu(extent[i].block),
> -				 be16_to_cpu(extent[i].count));
> -	dprint(DBG_EXTENT, "\n");
> +		hfs_dbg_cont(EXTENT, " %u:%u",
> +			     be16_to_cpu(extent[i].block),
> +			     be16_to_cpu(extent[i].count));
> +	hfs_dbg_cont(EXTENT, "\n");
>  }
>  
>  static int hfs_add_extent(struct hfs_extent *extent, u16 offset,
> @@ -392,10 +393,10 @@ int hfs_extend_file(struct inode *inode)
>  		goto out;
>  	}
>  
> -	dprint(DBG_EXTENT, "extend %lu: %u,%u\n", inode->i_ino, start, len);
> +	hfs_dbg(EXTENT, "extend %lu: %u,%u\n", inode->i_ino, start, len);
>  	if (HFS_I(inode)->alloc_blocks == HFS_I(inode)->first_blocks) {
>  		if (!HFS_I(inode)->first_blocks) {
> -			dprint(DBG_EXTENT, "first extents\n");
> +			hfs_dbg(EXTENT, "first extents\n");
>  			/* no extents yet */
>  			HFS_I(inode)->first_extents[0].block = cpu_to_be16(start);
>  			HFS_I(inode)->first_extents[0].count = cpu_to_be16(len);
> @@ -437,7 +438,7 @@ out:
>  	return res;
>  
>  insert_extent:
> -	dprint(DBG_EXTENT, "insert new extent\n");
> +	hfs_dbg(EXTENT, "insert new extent\n");
>  	hfs_ext_write_extent(inode);
>  
>  	memset(HFS_I(inode)->cached_extents, 0, sizeof(hfs_extent_rec));
> @@ -460,8 +461,9 @@ void hfs_file_truncate(struct inode *inode)
>  	u32 size;
>  	int res;
>  
> -	dprint(DBG_INODE, "truncate: %lu, %Lu -> %Lu\n", inode->i_ino,
> -	       (long long)HFS_I(inode)->phys_size, inode->i_size);
> +	hfs_dbg(INODE, "truncate: %lu, %Lu -> %Lu\n",
> +		inode->i_ino, (long long)HFS_I(inode)->phys_size,
> +		inode->i_size);
>  	if (inode->i_size > HFS_I(inode)->phys_size) {
>  		struct address_space *mapping = inode->i_mapping;
>  		void *fsdata;
> diff --git a/fs/hfs/hfs_fs.h b/fs/hfs/hfs_fs.h
> index 693df9f..cf088e0 100644
> --- a/fs/hfs/hfs_fs.h
> +++ b/fs/hfs/hfs_fs.h
> @@ -34,8 +34,18 @@
>  //#define DBG_MASK	(DBG_CAT_MOD|DBG_BNODE_REFS|DBG_INODE|DBG_EXTENT)
>  #define DBG_MASK	(0)
>  
> -#define dprint(flg, fmt, args...) \
> -	if (flg & DBG_MASK) printk(fmt , ## args)
> +#define hfs_dbg(flg, fmt, ...)				\
> +do {							\
> +	if (DBG_##flg & DBG_MASK)			\
> +		printk(KERN_DEBUG fmt, ##__VA_ARGS__);	\
> +} while (0)
> +
> +#define hfs_dbg_cont(flg, fmt, ...)			\
> +do {							\
> +	if (DBG_##flg & DBG_MASK)			\
> +		printk(KERN_CONT fmt, ##__VA_ARGS__);	\
> +} while (0)
> +
>  
>  /*
>   * struct hfs_inode_info
> diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
> index a9d60d4..d999db7 100644
> --- a/fs/hfs/inode.c
> +++ b/fs/hfs/inode.c
> @@ -238,7 +238,7 @@ void hfs_delete_inode(struct inode *inode)
>  {
>  	struct super_block *sb = inode->i_sb;
>  
> -	dprint(DBG_INODE, "delete_inode: %lu\n", inode->i_ino);
> +	hfs_dbg(INODE, "delete_inode: %lu\n", inode->i_ino);
>  	if (S_ISDIR(inode->i_mode)) {
>  		HFS_SB(sb)->folder_count--;
>  		if (HFS_I(inode)->cat_key.ParID == cpu_to_be32(HFS_ROOT_CNID))
> @@ -418,7 +418,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc)
>  	struct hfs_find_data fd;
>  	hfs_cat_rec rec;
>  
> -	dprint(DBG_INODE, "hfs_write_inode: %lu\n", inode->i_ino);
> +	hfs_dbg(INODE, "hfs_write_inode: %lu\n", inode->i_ino);
>  	hfs_ext_write_extent(inode);
>  
>  	if (inode->i_ino < HFS_FIRSTUSER_CNID) {
> diff --git a/fs/hfsplus/attributes.c b/fs/hfsplus/attributes.c
> index 8d691f1..2043b50 100644
> --- a/fs/hfsplus/attributes.c
> +++ b/fs/hfsplus/attributes.c
> @@ -166,7 +166,7 @@ int hfsplus_find_attr(struct super_block *sb, u32 cnid,
>  {
>  	int err = 0;
>  
> -	dprint(DBG_ATTR_MOD, "find_attr: %s,%d\n", name ? name : NULL, cnid);
> +	hfs_dbg(ATTR_MOD, "find_attr: %s,%d\n", name ? name : NULL, cnid);
>  
>  	if (!HFSPLUS_SB(sb)->attr_tree) {
>  		printk(KERN_ERR "hfs: attributes file doesn't exist\n");
> @@ -228,7 +228,7 @@ int hfsplus_create_attr(struct inode *inode,
>  	int entry_size;
>  	int err;
>  
> -	dprint(DBG_ATTR_MOD, "create_attr: %s,%ld\n",
> +	hfs_dbg(ATTR_MOD, "create_attr: %s,%ld\n",
>  		name ? name : NULL, inode->i_ino);
>  
>  	if (!HFSPLUS_SB(sb)->attr_tree) {
> @@ -328,7 +328,7 @@ int hfsplus_delete_attr(struct inode *inode, const char *name)
>  	struct super_block *sb = inode->i_sb;
>  	struct hfs_find_data fd;
>  
> -	dprint(DBG_ATTR_MOD, "delete_attr: %s,%ld\n",
> +	hfs_dbg(ATTR_MOD, "delete_attr: %s,%ld\n",
>  		name ? name : NULL, inode->i_ino);
>  
>  	if (!HFSPLUS_SB(sb)->attr_tree) {
> @@ -369,7 +369,7 @@ int hfsplus_delete_all_attrs(struct inode *dir, u32 cnid)
>  	int err = 0;
>  	struct hfs_find_data fd;
>  
> -	dprint(DBG_ATTR_MOD, "delete_all_attrs: %d\n", cnid);
> +	hfs_dbg(ATTR_MOD, "delete_all_attrs: %d\n", cnid);
>  
>  	if (!HFSPLUS_SB(dir->i_sb)->attr_tree) {
>  		printk(KERN_ERR "hfs: attributes file doesn't exist\n");
> diff --git a/fs/hfsplus/bfind.c b/fs/hfsplus/bfind.c
> index bbfdc17..d27f37f 100644
> --- a/fs/hfsplus/bfind.c
> +++ b/fs/hfsplus/bfind.c
> @@ -22,7 +22,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;
> -	dprint(DBG_BNODE_REFS, "find_init: %d (%p)\n",
> +	hfs_dbg(BNODE_REFS, "find_init: %d (%p)\n",
>  		tree->cnid, __builtin_return_address(0));
>  	switch (tree->cnid) {
>  	case HFSPLUS_CAT_CNID:
> @@ -44,7 +44,7 @@ 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",
> +	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;
> diff --git a/fs/hfsplus/bitmap.c b/fs/hfsplus/bitmap.c
> index 6feefc0..7da6d46 100644
> --- a/fs/hfsplus/bitmap.c
> +++ b/fs/hfsplus/bitmap.c
> @@ -30,7 +30,7 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
>  	if (!len)
>  		return size;
>  
> -	dprint(DBG_BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);
> +	hfs_dbg(BITMAP, "block_allocate: %u,%u,%u\n", size, offset, len);
>  	mutex_lock(&sbi->alloc_mutex);
>  	mapping = sbi->alloc_file->i_mapping;
>  	page = read_mapping_page(mapping, offset / PAGE_CACHE_BITS, NULL);
> @@ -89,14 +89,14 @@ int hfsplus_block_allocate(struct super_block *sb, u32 size,
>  		else
>  			end = pptr + ((size + 31) & (PAGE_CACHE_BITS - 1)) / 32;
>  	}
> -	dprint(DBG_BITMAP, "bitmap full\n");
> +	hfs_dbg(BITMAP, "bitmap full\n");
>  	start = size;
>  	goto out;
>  
>  found:
>  	start = offset + (curr - pptr) * 32 + i;
>  	if (start >= size) {
> -		dprint(DBG_BITMAP, "bitmap full\n");
> +		hfs_dbg(BITMAP, "bitmap full\n");
>  		goto out;
>  	}
>  	/* do any partial u32 at the start */
> @@ -154,7 +154,7 @@ done:
>  	*max = offset + (curr - pptr) * 32 + i - start;
>  	sbi->free_blocks -= *max;
>  	hfsplus_mark_mdb_dirty(sb);
> -	dprint(DBG_BITMAP, "-> %u,%u\n", start, *max);
> +	hfs_dbg(BITMAP, "-> %u,%u\n", start, *max);
>  out:
>  	mutex_unlock(&sbi->alloc_mutex);
>  	return start;
> @@ -173,7 +173,7 @@ int hfsplus_block_free(struct super_block *sb, u32 offset, u32 count)
>  	if (!count)
>  		return 0;
>  
> -	dprint(DBG_BITMAP, "block_free: %u,%u\n", offset, count);
> +	hfs_dbg(BITMAP, "block_free: %u,%u\n", offset, count);
>  	/* are all of the bits in range? */
>  	if ((offset + count) > sbi->total_blocks)
>  		return -ENOENT;
> diff --git a/fs/hfsplus/bnode.c b/fs/hfsplus/bnode.c
> index f31ac6f..1ca9304 100644
> --- a/fs/hfsplus/bnode.c
> +++ b/fs/hfsplus/bnode.c
> @@ -130,7 +130,7 @@ void hfs_bnode_copy(struct hfs_bnode *dst_node, int dst,
>  	struct page **src_page, **dst_page;
>  	int l;
>  
> -	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;
> @@ -188,7 +188,7 @@ void hfs_bnode_move(struct hfs_bnode *node, int dst, int src, int len)
>  	struct page **src_page, **dst_page;
>  	int l;
>  
> -	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;
> @@ -302,16 +302,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(BNODE_MOD, " %d", key_off);
>  		if (i && node->type == HFS_NODE_INDEX) {
>  			int tmp;
>  
> @@ -320,17 +320,17 @@ void hfs_bnode_dump(struct hfs_bnode *node)
>  				tmp = hfs_bnode_read_u16(node, key_off) + 2;
>  			else
>  				tmp = node->tree->max_key_len + 2;
> -			dprint(DBG_BNODE_MOD, " (%d", tmp);
> +			hfs_dbg_cont(BNODE_MOD, " (%d", tmp);
>  			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_u16(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)
> @@ -366,7 +366,7 @@ void hfs_bnode_unlink(struct hfs_bnode *node)
>  
>  	/* move down? */
>  	if (!node->prev && !node->next)
> -		dprint(DBG_BNODE_MOD, "hfs_btree_del_level\n");
> +		hfs_dbg(BNODE_MOD, "hfs_btree_del_level\n");
>  	if (!node->parent) {
>  		tree->root = 0;
>  		tree->depth = 0;
> @@ -425,8 +425,8 @@ 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",
> -	       node->tree->cnid, node->this);
> +	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);
>  	node2 = hfs_bnode_findhash(tree, cnid);
> @@ -470,7 +470,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)
> @@ -620,7 +620,7 @@ void hfs_bnode_get(struct hfs_bnode *node)
>  {
>  	if (node) {
>  		atomic_inc(&node->refcnt);
> -		dprint(DBG_BNODE_REFS, "get_node(%d:%d): %d\n",
> +		hfs_dbg(BNODE_REFS, "get_node(%d:%d): %d\n",
>  			node->tree->cnid, node->this,
>  			atomic_read(&node->refcnt));
>  	}
> @@ -633,7 +633,7 @@ 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",
> +		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));
> diff --git a/fs/hfsplus/brec.c b/fs/hfsplus/brec.c
> index 298d4e4..e238ba8 100644
> --- a/fs/hfsplus/brec.c
> +++ b/fs/hfsplus/brec.c
> @@ -90,7 +90,7 @@ 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",
> +	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)
> @@ -191,7 +191,7 @@ again:
>  		mark_inode_dirty(tree->inode);
>  	}
>  	hfs_bnode_dump(node);
> -	dprint(DBG_BNODE_MOD, "remove_rec: %d, %d\n",
> +	hfs_dbg(BNODE_MOD, "remove_rec: %d, %d\n",
>  		fd->record, fd->keylength + fd->entrylength);
>  	if (!--node->num_recs) {
>  		hfs_bnode_unlink(node);
> @@ -244,7 +244,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;
> @@ -379,7 +379,7 @@ again:
>  		newkeylen = hfs_bnode_read_u16(node, 14) + 2;
>  	else
>  		fd->keylength = newkeylen = tree->max_key_len + 2;
> -	dprint(DBG_BNODE_MOD, "update_rec: %d, %d, %d\n",
> +	hfs_dbg(BNODE_MOD, "update_rec: %d, %d, %d\n",
>  		rec, fd->keylength, newkeylen);
>  
>  	rec_off = tree->node_size - (rec + 2) * 2;
> @@ -391,7 +391,7 @@ again:
>  		end_off = hfs_bnode_read_u16(parent, end_rec_off);
>  		if (end_rec_off - end_off < diff) {
>  
> -			dprint(DBG_BNODE_MOD, "hfs: splitting index node.\n");
> +			hfs_dbg(BNODE_MOD, "splitting index node\n");
>  			fd->bnode = parent;
>  			new_node = hfs_bnode_split(fd);
>  			if (IS_ERR(new_node))
> diff --git a/fs/hfsplus/btree.c b/fs/hfsplus/btree.c
> index efb689c..c2fa4bf 100644
> --- a/fs/hfsplus/btree.c
> +++ b/fs/hfsplus/btree.c
> @@ -303,7 +303,7 @@ struct hfs_bnode *hfs_bmap_alloc(struct hfs_btree *tree)
>  		kunmap(*pagep);
>  		nidx = node->next;
>  		if (!nidx) {
> -			dprint(DBG_BNODE_MOD, "hfs: create new bmap node.\n");
> +			hfs_dbg(BNODE_MOD, "create new bmap node\n");
>  			next_node = hfs_bmap_new_bmap(node, idx);
>  		} else
>  			next_node = hfs_bnode_find(tree, nidx);
> @@ -329,7 +329,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);
>  	BUG_ON(!node->this);
>  	tree = node->tree;
>  	nidx = node->this;
> diff --git a/fs/hfsplus/catalog.c b/fs/hfsplus/catalog.c
> index 840d71e..12cea23 100644
> --- a/fs/hfsplus/catalog.c
> +++ b/fs/hfsplus/catalog.c
> @@ -212,7 +212,7 @@ int hfsplus_create_cat(u32 cnid, struct inode *dir,
>  	int entry_size;
>  	int err;
>  
> -	dprint(DBG_CAT_MOD, "create_cat: %s,%u(%d)\n",
> +	hfs_dbg(CAT_MOD, "create_cat: %s,%u(%d)\n",
>  		str->name, cnid, inode->i_nlink);
>  	err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
>  	if (err)
> @@ -271,8 +271,7 @@ int hfsplus_delete_cat(u32 cnid, struct inode *dir, struct qstr *str)
>  	int err, off;
>  	u16 type;
>  
> -	dprint(DBG_CAT_MOD, "delete_cat: %s,%u\n",
> -		str ? str->name : NULL, cnid);
> +	hfs_dbg(CAT_MOD, "delete_cat: %s,%u\n", str ? str->name : NULL, cnid);
>  	err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &fd);
>  	if (err)
>  		return err;
> @@ -361,7 +360,7 @@ int hfsplus_rename_cat(u32 cnid,
>  	int entry_size, type;
>  	int err;
>  
> -	dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
> +	hfs_dbg(CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
>  		cnid, src_dir->i_ino, src_name->name,
>  		dst_dir->i_ino, dst_name->name);
>  	err = hfs_find_init(HFSPLUS_SB(sb)->cat_tree, &src_fd);
> diff --git a/fs/hfsplus/extents.c b/fs/hfsplus/extents.c
> index a94f0f7..7541731 100644
> --- a/fs/hfsplus/extents.c
> +++ b/fs/hfsplus/extents.c
> @@ -265,7 +265,7 @@ int hfsplus_get_block(struct inode *inode, sector_t iblock,
>  	mutex_unlock(&hip->extents_lock);
>  
>  done:
> -	dprint(DBG_EXTENT, "get_block(%lu): %llu - %u\n",
> +	hfs_dbg(EXTENT, "get_block(%lu): %llu - %u\n",
>  		inode->i_ino, (long long)iblock, dblock);
>  
>  	mask = (1 << sbi->fs_shift) - 1;
> @@ -288,11 +288,12 @@ static void hfsplus_dump_extent(struct hfsplus_extent *extent)
>  {
>  	int i;
>  
> -	dprint(DBG_EXTENT, "   ");
> +	hfs_dbg(EXTENT, "   ");
>  	for (i = 0; i < 8; i++)
> -		dprint(DBG_EXTENT, " %u:%u", be32_to_cpu(extent[i].start_block),
> -				 be32_to_cpu(extent[i].block_count));
> -	dprint(DBG_EXTENT, "\n");
> +		hfs_dbg_cont(EXTENT, " %u:%u",
> +			     be32_to_cpu(extent[i].start_block),
> +			     be32_to_cpu(extent[i].block_count));
> +	hfs_dbg_cont(EXTENT, "\n");
>  }
>  
>  static int hfsplus_add_extent(struct hfsplus_extent *extent, u32 offset,
> @@ -349,7 +350,7 @@ found:
>  			err = hfsplus_block_free(sb, start, count);
>  			if (err) {
>  				printk(KERN_ERR "hfs: can't free extent\n");
> -				dprint(DBG_EXTENT, " start: %u count: %u\n",
> +				hfs_dbg(EXTENT, " start: %u count: %u\n",
>  					start, count);
>  			}
>  			extent->block_count = 0;
> @@ -360,7 +361,7 @@ found:
>  			err = hfsplus_block_free(sb, start + count, block_nr);
>  			if (err) {
>  				printk(KERN_ERR "hfs: can't free extent\n");
> -				dprint(DBG_EXTENT, " start: %u count: %u\n",
> +				hfs_dbg(EXTENT, " start: %u count: %u\n",
>  					start, count);
>  			}
>  			extent->block_count = cpu_to_be32(count);
> @@ -459,11 +460,11 @@ int hfsplus_file_extend(struct inode *inode)
>  		}
>  	}
>  
> -	dprint(DBG_EXTENT, "extend %lu: %u,%u\n", inode->i_ino, start, len);
> +	hfs_dbg(EXTENT, "extend %lu: %u,%u\n", inode->i_ino, start, len);
>  
>  	if (hip->alloc_blocks <= hip->first_blocks) {
>  		if (!hip->first_blocks) {
> -			dprint(DBG_EXTENT, "first extents\n");
> +			hfs_dbg(EXTENT, "first extents\n");
>  			/* no extents yet */
>  			hip->first_extents[0].start_block = cpu_to_be32(start);
>  			hip->first_extents[0].block_count = cpu_to_be32(len);
> @@ -500,7 +501,7 @@ out:
>  	return res;
>  
>  insert_extent:
> -	dprint(DBG_EXTENT, "insert new extent\n");
> +	hfs_dbg(EXTENT, "insert new extent\n");
>  	res = hfsplus_ext_write_extent_locked(inode);
>  	if (res)
>  		goto out;
> @@ -525,9 +526,8 @@ void hfsplus_file_truncate(struct inode *inode)
>  	u32 alloc_cnt, blk_cnt, start;
>  	int res;
>  
> -	dprint(DBG_INODE, "truncate: %lu, %llu -> %llu\n",
> -		inode->i_ino, (long long)hip->phys_size,
> -		inode->i_size);
> +	hfs_dbg(INODE, "truncate: %lu, %llu -> %llu\n",
> +		inode->i_ino, (long long)hip->phys_size, inode->i_size);
>  
>  	if (inode->i_size > hip->phys_size) {
>  		struct address_space *mapping = inode->i_mapping;
> diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h
> index 05b11f3..910ea98e 100644
> --- a/fs/hfsplus/hfsplus_fs.h
> +++ b/fs/hfsplus/hfsplus_fs.h
> @@ -32,9 +32,17 @@
>  #endif
>  #define DBG_MASK	(0)
>  
> -#define dprint(flg, fmt, args...) \
> -	if (flg & DBG_MASK) \
> -		printk(fmt , ## args)
> +#define hfs_dbg(flg, fmt, ...)				\
> +do {							\
> +	if (DBG_##flg & DBG_MASK)			\
> +		printk(KERN_DEBUG fmt, ##__VA_ARGS__);	\
> +} while (0)
> +
> +#define hfs_dbg_cont(flg, fmt, ...)			\
> +do {							\
> +	if (DBG_##flg & DBG_MASK)			\
> +		printk(KERN_CONT fmt, ##__VA_ARGS__);	\
> +} while (0)
>  
>  /* Runtime config options */
>  #define HFSPLUS_DEF_CR_TYPE    0x3F3F3F3F  /* '????' */
> diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c
> index 7b87284..4886fd3 100644
> --- a/fs/hfsplus/super.c
> +++ b/fs/hfsplus/super.c
> @@ -145,7 +145,7 @@ static int hfsplus_write_inode(struct inode *inode,
>  {
>  	int err;
>  
> -	dprint(DBG_INODE, "hfsplus_write_inode: %lu\n", inode->i_ino);
> +	hfs_dbg(INODE, "hfsplus_write_inode: %lu\n", inode->i_ino);
>  
>  	err = hfsplus_ext_write_extent(inode);
>  	if (err)
> @@ -160,7 +160,7 @@ static int hfsplus_write_inode(struct inode *inode,
>  
>  static void hfsplus_evict_inode(struct inode *inode)
>  {
> -	dprint(DBG_INODE, "hfsplus_evict_inode: %lu\n", inode->i_ino);
> +	hfs_dbg(INODE, "hfsplus_evict_inode: %lu\n", inode->i_ino);
>  	truncate_inode_pages(&inode->i_data, 0);
>  	clear_inode(inode);
>  	if (HFSPLUS_IS_RSRC(inode)) {
> @@ -179,7 +179,7 @@ static int hfsplus_sync_fs(struct super_block *sb, int wait)
>  	if (!wait)
>  		return 0;
>  
> -	dprint(DBG_SUPER, "hfsplus_sync_fs\n");
> +	hfs_dbg(SUPER, "hfsplus_sync_fs\n");
>  
>  	/*
>  	 * Explicitly write out the special metadata inodes.
> @@ -275,7 +275,7 @@ static void hfsplus_put_super(struct super_block *sb)
>  {
>  	struct hfsplus_sb_info *sbi = HFSPLUS_SB(sb);
>  
> -	dprint(DBG_SUPER, "hfsplus_put_super\n");
> +	hfs_dbg(SUPER, "hfsplus_put_super\n");
>  
>  	cancel_delayed_work_sync(&sbi->sync_work);
>  


--
To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Ext4 Filesystem]     [Union Filesystem]     [Filesystem Testing]     [Ceph Users]     [Ecryptfs]     [AutoFS]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux Cachefs]     [Reiser Filesystem]     [Linux RAID]     [Samba]     [Device Mapper]     [CEPH Development]
  Powered by Linux