Commit 12062ddd authored by Eric Sandeen's avatar Eric Sandeen Committed by Theodore Ts'o
Browse files

ext4: move __func__ into a macro for ext4_warning, ext4_error 



Just a pet peeve of mine; we had a mishash of calls with either __func__
or "function_name" and the latter tends to get out of sync.

I think it's easier to just hide the __func__ in a macro, and it'll
be consistent from then on.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent f710b4b9

fs/ext4/balloc.c

+10 −19
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ unsigned ext4_init_block_bitmap(struct super_block *sb, struct buffer_head *bh, 
		/* If checksum is bad mark all blocks used to prevent allocation

		 * essentially implementing a per-group read-only flag. */

		if (!ext4_group_desc_csum_verify(sbi, block_group, gdp)) {

			ext4_error(sb, __func__,

				  "Checksum bad for group %u", block_group);

			ext4_error(sb, "Checksum bad for group %u",

					block_group);

			ext4_free_blks_set(sb, gdp, 0);

			ext4_free_inodes_set(sb, gdp, 0);

			ext4_itable_unused_set(sb, gdp, 0);
@@ -210,10 +210,8 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, 
	struct ext4_sb_info *sbi = EXT4_SB(sb);



	if (block_group >= ngroups) {

		ext4_error(sb, "ext4_get_group_desc",

			   "block_group >= groups_count - "

			   "block_group = %u, groups_count = %u",

			   block_group, ngroups);

		ext4_error(sb, "block_group >= groups_count - block_group = %u,"

			   " groups_count = %u", block_group, ngroups);



		return NULL;

	}
@@ -221,8 +219,7 @@ struct ext4_group_desc * ext4_get_group_desc(struct super_block *sb, 
	group_desc = block_group >> EXT4_DESC_PER_BLOCK_BITS(sb);

	offset = block_group & (EXT4_DESC_PER_BLOCK(sb) - 1);

	if (!sbi->s_group_desc[group_desc]) {

		ext4_error(sb, "ext4_get_group_desc",

			   "Group descriptor not loaded - "

		ext4_error(sb, "Group descriptor not loaded - "

			   "block_group = %u, group_desc = %u, desc = %u",

			   block_group, group_desc, offset);

		return NULL;
@@ -282,9 +279,7 @@ static int ext4_valid_block_bitmap(struct super_block *sb, 
		return 1;



err_out:

	ext4_error(sb, __func__,

			"Invalid block bitmap - "

			"block_group = %d, block = %llu",

	ext4_error(sb, "Invalid block bitmap - block_group = %d, block = %llu",

			block_group, bitmap_blk);

	return 0;

}
@@ -311,8 +306,7 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
	bitmap_blk = ext4_block_bitmap(sb, desc);

	bh = sb_getblk(sb, bitmap_blk);

	if (unlikely(!bh)) {

		ext4_error(sb, __func__,

			    "Cannot read block bitmap - "

		ext4_error(sb, "Cannot read block bitmap - "

			    "block_group = %u, block_bitmap = %llu",

			    block_group, bitmap_blk);

		return NULL;
@@ -354,8 +348,7 @@ ext4_read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
	set_bitmap_uptodate(bh);

	if (bh_submit_read(bh) < 0) {

		put_bh(bh);

		ext4_error(sb, __func__,

			    "Cannot read block bitmap - "

		ext4_error(sb, "Cannot read block bitmap - "

			    "block_group = %u, block_bitmap = %llu",

			    block_group, bitmap_blk);

		return NULL;
@@ -419,8 +412,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
	    in_range(block, ext4_inode_table(sb, desc), sbi->s_itb_per_group) ||

	    in_range(block + count - 1, ext4_inode_table(sb, desc),

		     sbi->s_itb_per_group)) {

		ext4_error(sb, __func__,

			   "Adding blocks in system zones - "

		ext4_error(sb, "Adding blocks in system zones - "

			   "Block = %llu, count = %lu",

			   block, count);

		goto error_return;
@@ -453,8 +445,7 @@ void ext4_add_groupblocks(handle_t *handle, struct super_block *sb, 
		BUFFER_TRACE(bitmap_bh, "clear bit");

		if (!ext4_clear_bit_atomic(ext4_group_lock_ptr(sb, block_group),

						bit + i, bitmap_bh->b_data)) {

			ext4_error(sb, __func__,

				   "bit already cleared for block %llu",

			ext4_error(sb, "bit already cleared for block %llu",

				   (ext4_fsblk_t)(block + i));

			BUFFER_TRACE(bitmap_bh, "bit already cleared");

		} else {

fs/ext4/dir.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ int ext4_check_dir_entry(const char *function, struct inode *dir, 
		error_msg = "inode out of bounds";



	if (error_msg != NULL)

		ext4_error(dir->i_sb, function,

		__ext4_error(dir->i_sb, function,

			"bad entry in directory #%lu: %s - "

			"offset=%u, inode=%u, rec_len=%d, name_len=%d",

			dir->i_ino, error_msg, offset,
@@ -150,7 +150,7 @@ static int ext4_readdir(struct file *filp, 
		 */

		if (!bh) {

			if (!dir_has_error) {

				ext4_error(sb, __func__, "directory #%lu "

				ext4_error(sb, "directory #%lu "

					   "contains a hole at offset %Lu",

					   inode->i_ino,

					   (unsigned long long) filp->f_pos);

fs/ext4/ext4.h

+5 −2
Original line number Diff line number Diff line
@@ -1486,13 +1486,16 @@ extern int ext4_group_extend(struct super_block *sb, 
				ext4_fsblk_t n_blocks_count);



/* super.c */

extern void ext4_error(struct super_block *, const char *, const char *, ...)

extern void __ext4_error(struct super_block *, const char *, const char *, ...)

	__attribute__ ((format (printf, 3, 4)));

#define ext4_error(sb, message...)	__ext4_error(sb, __func__, ## message)

extern void __ext4_std_error(struct super_block *, const char *, int);

extern void ext4_abort(struct super_block *, const char *, const char *, ...)

	__attribute__ ((format (printf, 3, 4)));

extern void ext4_warning(struct super_block *, const char *, const char *, ...)

extern void __ext4_warning(struct super_block *, const char *,

			  const char *, ...)

	__attribute__ ((format (printf, 3, 4)));

#define ext4_warning(sb, message...)	__ext4_warning(sb, __func__, ## message)

extern void ext4_msg(struct super_block *, const char *, const char *, ...)

	__attribute__ ((format (printf, 3, 4)));

extern void ext4_grp_locked_error(struct super_block *, ext4_group_t,

fs/ext4/ext4_jbd2.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle, 
		if (inode && inode_needs_sync(inode)) {

			sync_dirty_buffer(bh);

			if (buffer_req(bh) && !buffer_uptodate(bh)) {

				ext4_error(inode->i_sb, __func__,

				ext4_error(inode->i_sb,

					   "IO error syncing inode, "

					   "inode=%lu, block=%llu",

					   inode->i_ino,

fs/ext4/extents.c

+5 −4
Original line number Diff line number Diff line
@@ -440,7 +440,7 @@ static int __ext4_ext_check(const char *function, struct inode *inode, 
	return 0;



corrupted:

	ext4_error(inode->i_sb, function,

	__ext4_error(inode->i_sb, function,

			"bad header/extent in inode #%lu: %s - magic %x, "

			"entries %u, max %u(%u), depth %u(%u)",

			inode->i_ino, error_msg, le16_to_cpu(eh->eh_magic),
@@ -1538,8 +1538,9 @@ int ext4_ext_try_to_merge(struct inode *inode, 
		merge_done = 1;

		WARN_ON(eh->eh_entries == 0);

		if (!eh->eh_entries)

			ext4_error(inode->i_sb, "ext4_ext_try_to_merge",

			   "inode#%lu, eh->eh_entries = 0!", inode->i_ino);

			ext4_error(inode->i_sb,

				   "inode#%lu, eh->eh_entries = 0!",

				   inode->i_ino);

	}



	return merge_done;
@@ -3238,7 +3239,7 @@ int ext4_ext_get_blocks(handle_t *handle, struct inode *inode, 
	 * this is why assert can't be put in ext4_ext_find_extent()

	 */

	if (path[depth].p_ext == NULL && depth != 0) {

		ext4_error(inode->i_sb, __func__, "bad extent address "

		ext4_error(inode->i_sb, "bad extent address "

			   "inode: %lu, iblock: %d, depth: %d",

			   inode->i_ino, iblock, depth);

		err = -EIO;

CRA Git | Maintained and supported by SUSTech CRA and CCSE