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 113e9ae877400af2bc047badb05b99f384ce6e93..cbb21b1588fc97653bf0074a9c1cbe5a84280446 100644 (file)
--- a/fs/unionfs/dentry.c
+++ b/fs/unionfs/dentry.c
@@ -424,7 +424,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 4f256c0186687ad59a9eec7dee29153af3586336..a3017ec309e0baf7ae2cad9f8d1cd387611b93c3 100644 (file)
--- a/fs/unionfs/union.h
+++ b/fs/unionfs/union.h
@@ -588,24 +588,24 @@ static inline struct dentry *__odf_dstack_pop(struct dentry_stack *stack)
 #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 unionfs_check_nd(n)    __unionfs_check_nd((n),         \
-       __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);