From e4798d1edaa39c6a2fa791887708ba76d3fc0334 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sun, 23 Mar 2008 02:41:17 -0400 Subject: [PATCH] Unionfs: use __func__ instead of __FUNCTION__ Signed-off-by: Erez Zadok --- fs/unionfs/dentry.c | 2 +- fs/unionfs/union.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c index b54fbc2db1a..61bba4bc81d 100644 --- a/fs/unionfs/dentry.c +++ b/fs/unionfs/dentry.c @@ -399,7 +399,7 @@ bool __unionfs_d_revalidate_chain(struct dentry *dentry, struct nameidata *nd, chain = kzalloc(chain_len * sizeof(struct dentry *), GFP_KERNEL); if (unlikely(!chain)) { printk(KERN_CRIT "unionfs: no more memory in %s\n", - __FUNCTION__); + __func__); goto out; } diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h index 2bd5bac7792..aecc1f5d240 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -558,22 +558,22 @@ static inline void unionfs_mntput(struct dentry *dentry, int bindex) #ifdef CONFIG_UNION_FS_DEBUG /* useful for tracking code reachability */ -#define UDBG pr_debug("DBG:%s:%s:%d\n", __FILE__, __FUNCTION__, __LINE__) +#define UDBG pr_debug("DBG:%s:%s:%d\n", __FILE__, __func__, __LINE__) #define unionfs_check_inode(i) __unionfs_check_inode((i), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) #define unionfs_check_dentry(d) __unionfs_check_dentry((d), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) #define unionfs_check_file(f) __unionfs_check_file((f), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) #define show_branch_counts(sb) __show_branch_counts((sb), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) #define show_inode_times(i) __show_inode_times((i), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) #define show_dinode_times(d) __show_dinode_times((d), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) #define show_inode_counts(i) __show_inode_counts((i), \ - __FILE__, __FUNCTION__, __LINE__) + __FILE__, __func__, __LINE__) extern void __unionfs_check_inode(const struct inode *inode, const char *fname, const char *fxn, int line); -- 2.43.0