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

Commit 46e665e9 authored by Harvey Harrison's avatar Harvey Harrison Committed by Theodore Ts'o
Browse files

ext4: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 620de4e1

fs/ext4/balloc.c

+7 −7
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 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, __FUNCTION__,

			ext4_error(sb, __func__,

				  "Checksum bad for group %lu\n", block_group);

			gdp->bg_free_blocks_count = 0;

			gdp->bg_free_inodes_count = 0;
@@ -235,7 +235,7 @@ static int ext4_valid_block_bitmap(struct super_block *sb, 
		return 1;



err_out:

	ext4_error(sb, __FUNCTION__,

	ext4_error(sb, __func__,

			"Invalid block bitmap - "

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

			block_group, bitmap_blk);
@@ -264,7 +264,7 @@ 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, __FUNCTION__,

		ext4_error(sb, __func__,

			    "Cannot read block bitmap - "

			    "block_group = %d, block_bitmap = %llu",

			    (int)block_group, (unsigned long long)bitmap_blk);
@@ -281,7 +281,7 @@ read_block_bitmap(struct super_block *sb, ext4_group_t block_group) 
	}

	if (bh_submit_read(bh) < 0) {

		put_bh(bh);

		ext4_error(sb, __FUNCTION__,

		ext4_error(sb, __func__,

			    "Cannot read block bitmap - "

			    "block_group = %d, block_bitmap = %llu",

			    (int)block_group, (unsigned long long)bitmap_blk);
@@ -360,7 +360,7 @@ static void __rsv_window_dump(struct rb_root *root, int verbose, 
		BUG();

}

#define rsv_window_dump(root, verbose) \

	__rsv_window_dump((root), (verbose), __FUNCTION__)

	__rsv_window_dump((root), (verbose), __func__)

#else

#define rsv_window_dump(root, verbose) do {} while (0)

#endif
@@ -740,7 +740,7 @@ void ext4_free_blocks_sb(handle_t *handle, struct super_block *sb, 
		if (!ext4_clear_bit_atomic(sb_bgl_lock(sbi, block_group),

						bit + i, bitmap_bh->b_data)) {

			jbd_unlock_bh_state(bitmap_bh);

			ext4_error(sb, __FUNCTION__,

			ext4_error(sb, __func__,

				   "bit already cleared for block %llu",

				   (ext4_fsblk_t)(block + i));

			jbd_lock_bh_state(bitmap_bh);
@@ -1796,7 +1796,7 @@ ext4_fsblk_t ext4_new_blocks_old(handle_t *handle, struct inode *inode, 
			if (ext4_test_bit(grp_alloc_blk+i,

					bh2jh(bitmap_bh)->b_committed_data)) {

				printk("%s: block was unexpectedly set in "

					"b_committed_data\n", __FUNCTION__);

					"b_committed_data\n", __func__);

			}

		}

	}

fs/ext4/ext4_jbd2.c

+6 −6
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ int __ext4_journal_get_undo_access(const char *where, handle_t *handle, 
{

	int err = jbd2_journal_get_undo_access(handle, bh);

	if (err)

		ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

	return err;

}
@@ -18,7 +18,7 @@ int __ext4_journal_get_write_access(const char *where, handle_t *handle, 
{

	int err = jbd2_journal_get_write_access(handle, bh);

	if (err)

		ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

	return err;

}
@@ -27,7 +27,7 @@ int __ext4_journal_forget(const char *where, handle_t *handle, 
{

	int err = jbd2_journal_forget(handle, bh);

	if (err)

		ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

	return err;

}
@@ -36,7 +36,7 @@ int __ext4_journal_revoke(const char *where, handle_t *handle, 
{

	int err = jbd2_journal_revoke(handle, blocknr, bh);

	if (err)

		ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

	return err;

}
@@ -45,7 +45,7 @@ int __ext4_journal_get_create_access(const char *where, 
{

	int err = jbd2_journal_get_create_access(handle, bh);

	if (err)

		ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

	return err;

}
@@ -54,6 +54,6 @@ int __ext4_journal_dirty_metadata(const char *where, 
{

	int err = jbd2_journal_dirty_metadata(handle, bh);

	if (err)

		ext4_journal_abort_handle(where, __FUNCTION__, bh, handle,err);

		ext4_journal_abort_handle(where, __func__, bh, handle, err);

	return err;

}

fs/ext4/extents.c

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static int __ext4_ext_check_header(const char *function, struct inode *inode, 
}



#define ext4_ext_check_header(inode, eh, depth)	\

	__ext4_ext_check_header(__FUNCTION__, inode, eh, depth)

	__ext4_ext_check_header(__func__, inode, eh, depth)



#ifdef EXT_DEBUG

static void ext4_ext_show_path(struct inode *inode, struct ext4_ext_path *path)

fs/ext4/ialloc.c

+5 −5
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ unsigned ext4_init_inode_bitmap(struct super_block *sb, struct buffer_head *bh, 
	/* If checksum is bad mark all blocks and inodes use to prevent

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

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

		ext4_error(sb, __FUNCTION__, "Checksum bad for group %lu\n",

		ext4_error(sb, __func__, "Checksum bad for group %lu\n",

			   block_group);

		gdp->bg_free_blocks_count = 0;

		gdp->bg_free_inodes_count = 0;
@@ -586,7 +586,7 @@ struct inode *ext4_new_inode(handle_t *handle, struct inode * dir, int mode) 
	ino++;

	if ((group == 0 && ino < EXT4_FIRST_INO(sb)) ||

	    ino > EXT4_INODES_PER_GROUP(sb)) {

		ext4_error(sb, __FUNCTION__,

		ext4_error(sb, __func__,

			   "reserved inode or inode > inodes count - "

			   "block_group = %lu, inode=%lu", group,

			   ino + group * EXT4_INODES_PER_GROUP(sb));
@@ -792,7 +792,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) 


	/* Error cases - e2fsck has already cleaned up for us */

	if (ino > max_ino) {

		ext4_warning(sb, __FUNCTION__,

		ext4_warning(sb, __func__,

			     "bad orphan ino %lu!  e2fsck was run?", ino);

		goto error;

	}
@@ -801,7 +801,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) 
	bit = (ino - 1) % EXT4_INODES_PER_GROUP(sb);

	bitmap_bh = read_inode_bitmap(sb, block_group);

	if (!bitmap_bh) {

		ext4_warning(sb, __FUNCTION__,

		ext4_warning(sb, __func__,

			     "inode bitmap error for orphan %lu", ino);

		goto error;

	}
@@ -826,7 +826,7 @@ struct inode *ext4_orphan_get(struct super_block *sb, unsigned long ino) 
	err = PTR_ERR(inode);

	inode = NULL;

bad_orphan:

	ext4_warning(sb, __FUNCTION__,

	ext4_warning(sb, __func__,

		     "bad orphan inode %lu!  e2fsck was run?", ino);

	printk(KERN_NOTICE "ext4_test_bit(bit=%d, block=%llu) = %d\n",

	       bit, (unsigned long long)bitmap_bh->b_blocknr,

fs/ext4/inode.c

+4 −4
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ int ext4_forget(handle_t *handle, int is_metadata, struct inode *inode, 
	BUFFER_TRACE(bh, "call ext4_journal_revoke");

	err = ext4_journal_revoke(handle, blocknr, bh);

	if (err)

		ext4_abort(inode->i_sb, __FUNCTION__,

		ext4_abort(inode->i_sb, __func__,

			   "error %d when attempting revoke", err);

	BUFFER_TRACE(bh, "exit");

	return err;
@@ -1240,7 +1240,7 @@ int ext4_journal_dirty_data(handle_t *handle, struct buffer_head *bh) 
{

	int err = jbd2_journal_dirty_data(handle, bh);

	if (err)

		ext4_journal_abort_handle(__FUNCTION__, __FUNCTION__,

		ext4_journal_abort_handle(__func__, __func__,

						bh, handle, err);

	return err;

}
@@ -3371,7 +3371,7 @@ int ext4_mark_inode_dirty(handle_t *handle, struct inode *inode) 
				EXT4_I(inode)->i_state |= EXT4_STATE_NO_EXPAND;

				if (mnt_count !=

					le16_to_cpu(sbi->s_es->s_mnt_count)) {

					ext4_warning(inode->i_sb, __FUNCTION__,

					ext4_warning(inode->i_sb, __func__,

					"Unable to expand inode %lu. Delete"

					" some EAs or run e2fsck.",

					inode->i_ino);
@@ -3412,7 +3412,7 @@ void ext4_dirty_inode(struct inode *inode) 
		current_handle->h_transaction != handle->h_transaction) {

		/* This task has a transaction open against a different fs */

		printk(KERN_EMERG "%s: transactions do not match!\n",

		       __FUNCTION__);

		       __func__);

	} else {

		jbd_debug(5, "marking dirty.  outer handle=%p\n",

				current_handle);