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

Commit 4db9c54a authored by Stoyan Gaydarov's avatar Stoyan Gaydarov Committed by Theodore Ts'o
Browse files

ext4: replace __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__ instead

Signed-off-by: default avatarStoyan Gaydarov <stoyboyker@gmail.com>
Cc: Theodore Ts'o <tytso@mit.edu>
Cc: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 7e5a8cdd

fs/ext4/ext4.h

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
#define ext4_debug(f, a...)						\

	do {								\

		printk (KERN_DEBUG "EXT4-fs DEBUG (%s, %d): %s:",	\

			__FILE__, __LINE__, __FUNCTION__);		\

			__FILE__, __LINE__, __func__);			\

		printk (KERN_DEBUG f, ## a);				\

	} while (0)

#else
@@ -1163,7 +1163,7 @@ struct ext4_group_info *ext4_get_group_info(struct super_block *sb, 
#define ext4_std_error(sb, errno)				\

do {								\

	if ((errno))						\

		__ext4_std_error((sb), __FUNCTION__, (errno));	\

		__ext4_std_error((sb), __func__, (errno));	\

} while (0)



/*

fs/ext4/ext4_jbd2.h

+7 −7
Original line number Diff line number Diff line
@@ -142,17 +142,17 @@ int __ext4_journal_dirty_metadata(const char *where, 
				handle_t *handle, struct buffer_head *bh);



#define ext4_journal_get_undo_access(handle, bh) \

	__ext4_journal_get_undo_access(__FUNCTION__, (handle), (bh))

	__ext4_journal_get_undo_access(__func__, (handle), (bh))

#define ext4_journal_get_write_access(handle, bh) \

	__ext4_journal_get_write_access(__FUNCTION__, (handle), (bh))

	__ext4_journal_get_write_access(__func__, (handle), (bh))

#define ext4_journal_revoke(handle, blocknr, bh) \

	__ext4_journal_revoke(__FUNCTION__, (handle), (blocknr), (bh))

	__ext4_journal_revoke(__func__, (handle), (blocknr), (bh))

#define ext4_journal_get_create_access(handle, bh) \

	__ext4_journal_get_create_access(__FUNCTION__, (handle), (bh))

	__ext4_journal_get_create_access(__func__, (handle), (bh))

#define ext4_journal_dirty_metadata(handle, bh) \

	__ext4_journal_dirty_metadata(__FUNCTION__, (handle), (bh))

	__ext4_journal_dirty_metadata(__func__, (handle), (bh))

#define ext4_journal_forget(handle, bh) \

	__ext4_journal_forget(__FUNCTION__, (handle), (bh))

	__ext4_journal_forget(__func__, (handle), (bh))



int ext4_journal_dirty_data(handle_t *handle, struct buffer_head *bh);
@@ -165,7 +165,7 @@ static inline handle_t *ext4_journal_start(struct inode *inode, int nblocks) 
}



#define ext4_journal_stop(handle) \

	__ext4_journal_stop(__FUNCTION__, (handle))

	__ext4_journal_stop(__func__, (handle))



static inline handle_t *ext4_journal_current_handle(void)

{