Unionfs: use __func__ instead of __FUNCTION__

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c
index 67fca8b5119fab17d1d9f0562f876f527acd2dcc..be64357cc1d7a26f92405001e3d2e57e5bf50a8f 100644 (file)
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -401,7 +401,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 d58827736cb4bb5b4f9040e87179d607656cc825..352dedd80ee8cb57862a4a81da15b24729ce300a 100644 (file)
--- 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);