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

Commit e05b6b52 authored by Harvey Harrison's avatar Harvey Harrison Committed by Linus Torvalds
Browse files

ext3: 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 avatarLinus Torvalds <torvalds@linux-foundation.org>
parent fa1ff1e0

fs/ext3/balloc.c

+6 −6
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static int ext3_valid_block_bitmap(struct super_block *sb, 
		return 1;



err_out:

	ext3_error(sb, __FUNCTION__,

	ext3_error(sb, __func__,

			"Invalid block bitmap - "

			"block_group = %d, block = %lu",

			block_group, bitmap_blk);
@@ -147,7 +147,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) 
	bitmap_blk = le32_to_cpu(desc->bg_block_bitmap);

	bh = sb_getblk(sb, bitmap_blk);

	if (unlikely(!bh)) {

		ext3_error(sb, __FUNCTION__,

		ext3_error(sb, __func__,

			    "Cannot read block bitmap - "

			    "block_group = %d, block_bitmap = %u",

			    block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -158,7 +158,7 @@ read_block_bitmap(struct super_block *sb, unsigned int block_group) 


	if (bh_submit_read(bh) < 0) {

		brelse(bh);

		ext3_error(sb, __FUNCTION__,

		ext3_error(sb, __func__,

			    "Cannot read block bitmap - "

			    "block_group = %d, block_bitmap = %u",

			    block_group, le32_to_cpu(desc->bg_block_bitmap));
@@ -236,7 +236,7 @@ restart: 
	BUG_ON(bad);

}

#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
@@ -618,7 +618,7 @@ do_more: 
		if (!ext3_clear_bit_atomic(sb_bgl_lock(sbi, block_group),

						bit + i, bitmap_bh->b_data)) {

			jbd_unlock_bh_state(bitmap_bh);

			ext3_error(sb, __FUNCTION__,

			ext3_error(sb, __func__,

				"bit already cleared for block "E3FSBLK,

				 block + i);

			jbd_lock_bh_state(bitmap_bh);
@@ -1672,7 +1672,7 @@ allocated: 
			if (ext3_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/ext3/ext3_jbd.c

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

	int err = journal_get_undo_access(handle, bh);

	if (err)

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

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

	return err;

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

	int err = journal_get_write_access(handle, bh);

	if (err)

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

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

	return err;

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

	int err = journal_forget(handle, bh);

	if (err)

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

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

	return err;

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

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

	if (err)

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

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

	return err;

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

	int err = journal_get_create_access(handle, bh);

	if (err)

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

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

	return err;

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

	int err = journal_dirty_metadata(handle, bh);

	if (err)

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

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

	return err;

}

fs/ext3/ialloc.c

+3 −3
Original line number Diff line number Diff line
@@ -644,7 +644,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) 


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

	if (ino > max_ino) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __func__,

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

		goto error;

	}
@@ -653,7 +653,7 @@ struct inode *ext3_orphan_get(struct super_block *sb, unsigned long ino) 
	bit = (ino - 1) % EXT3_INODES_PER_GROUP(sb);

	bitmap_bh = read_inode_bitmap(sb, block_group);

	if (!bitmap_bh) {

		ext3_warning(sb, __FUNCTION__,

		ext3_warning(sb, __func__,

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

		goto error;

	}
@@ -678,7 +678,7 @@ iget_failed: 
	err = PTR_ERR(inode);

	inode = NULL;

bad_orphan:

	ext3_warning(sb, __FUNCTION__,

	ext3_warning(sb, __func__,

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

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

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

fs/ext3/inode.c

+3 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int ext3_forget(handle_t *handle, int is_metadata, struct inode *inode, 
	BUFFER_TRACE(bh, "call ext3_journal_revoke");

	err = ext3_journal_revoke(handle, blocknr, bh);

	if (err)

		ext3_abort(inode->i_sb, __FUNCTION__,

		ext3_abort(inode->i_sb, __func__,

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

	BUFFER_TRACE(bh, "exit");

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

	int err = journal_dirty_data(handle, bh);

	if (err)

		ext3_journal_abort_handle(__FUNCTION__, __FUNCTION__,

		ext3_journal_abort_handle(__func__, __func__,

						bh, handle, err);

	return err;

}
@@ -3201,7 +3201,7 @@ void ext3_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);

fs/ext3/namei.c

+13 −13
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, 
	if (root->info.hash_version != DX_HASH_TEA &&

	    root->info.hash_version != DX_HASH_HALF_MD4 &&

	    root->info.hash_version != DX_HASH_LEGACY) {

		ext3_warning(dir->i_sb, __FUNCTION__,

		ext3_warning(dir->i_sb, __func__,

			     "Unrecognised inode hash code %d",

			     root->info.hash_version);

		brelse(bh);
@@ -375,7 +375,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, 
	hash = hinfo->hash;



	if (root->info.unused_flags & 1) {

		ext3_warning(dir->i_sb, __FUNCTION__,

		ext3_warning(dir->i_sb, __func__,

			     "Unimplemented inode hash flags: %#06x",

			     root->info.unused_flags);

		brelse(bh);
@@ -384,7 +384,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, 
	}



	if ((indirect = root->info.indirect_levels) > 1) {

		ext3_warning(dir->i_sb, __FUNCTION__,

		ext3_warning(dir->i_sb, __func__,

			     "Unimplemented inode hash depth: %#06x",

			     root->info.indirect_levels);

		brelse(bh);
@@ -397,7 +397,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, 


	if (dx_get_limit(entries) != dx_root_limit(dir,

						   root->info.info_length)) {

		ext3_warning(dir->i_sb, __FUNCTION__,

		ext3_warning(dir->i_sb, __func__,

			     "dx entry: limit != root limit");

		brelse(bh);

		*err = ERR_BAD_DX_DIR;
@@ -409,7 +409,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, 
	{

		count = dx_get_count(entries);

		if (!count || count > dx_get_limit(entries)) {

			ext3_warning(dir->i_sb, __FUNCTION__,

			ext3_warning(dir->i_sb, __func__,

				     "dx entry: no count or count > limit");

			brelse(bh);

			*err = ERR_BAD_DX_DIR;
@@ -454,7 +454,7 @@ dx_probe(struct dentry *dentry, struct inode *dir, 
			goto fail2;

		at = entries = ((struct dx_node *) bh->b_data)->entries;

		if (dx_get_limit(entries) != dx_node_limit (dir)) {

			ext3_warning(dir->i_sb, __FUNCTION__,

			ext3_warning(dir->i_sb, __func__,

				     "dx entry: limit != node limit");

			brelse(bh);

			*err = ERR_BAD_DX_DIR;
@@ -470,7 +470,7 @@ fail2: 
	}

fail:

	if (*err == ERR_BAD_DX_DIR)

		ext3_warning(dir->i_sb, __FUNCTION__,

		ext3_warning(dir->i_sb, __func__,

			     "Corrupt dir inode %ld, running e2fsck is "

			     "recommended.", dir->i_ino);

	return NULL;
@@ -918,7 +918,7 @@ restart: 
		wait_on_buffer(bh);

		if (!buffer_uptodate(bh)) {

			/* read error, skip block & hope for the best */

			ext3_error(sb, __FUNCTION__, "reading directory #%lu "

			ext3_error(sb, __func__, "reading directory #%lu "

				   "offset %lu", dir->i_ino, block);

			brelse(bh);

			goto next;
@@ -1010,7 +1010,7 @@ static struct buffer_head * ext3_dx_find_entry(struct dentry *dentry, 
		retval = ext3_htree_next_block(dir, hash, frame,

					       frames, NULL);

		if (retval < 0) {

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __func__,

			     "error reading index page in directory #%lu",

			     dir->i_ino);

			*err = retval;
@@ -1535,7 +1535,7 @@ static int ext3_dx_add_entry(handle_t *handle, struct dentry *dentry, 


		if (levels && (dx_get_count(frames->entries) ==

			       dx_get_limit(frames->entries))) {

			ext3_warning(sb, __FUNCTION__,

			ext3_warning(sb, __func__,

				     "Directory index full!");

			err = -ENOSPC;

			goto cleanup;
@@ -1837,11 +1837,11 @@ static int empty_dir (struct inode * inode) 
	if (inode->i_size < EXT3_DIR_REC_LEN(1) + EXT3_DIR_REC_LEN(2) ||

	    !(bh = ext3_bread (NULL, inode, 0, 0, &err))) {

		if (err)

			ext3_error(inode->i_sb, __FUNCTION__,

			ext3_error(inode->i_sb, __func__,

				   "error %d reading directory #%lu offset 0",

				   err, inode->i_ino);

		else

			ext3_warning(inode->i_sb, __FUNCTION__,

			ext3_warning(inode->i_sb, __func__,

				     "bad directory (dir #%lu) - no data block",

				     inode->i_ino);

		return 1;
@@ -1870,7 +1870,7 @@ static int empty_dir (struct inode * inode) 
				offset >> EXT3_BLOCK_SIZE_BITS(sb), 0, &err);

			if (!bh) {

				if (err)

					ext3_error(sb, __FUNCTION__,

					ext3_error(sb, __func__,

						   "error %d reading directory"

						   " #%lu offset %lu",

						   err, inode->i_ino, offset);