Signed-off-by: Erez Zadok <ezk@xxxxxxxxxxxxx> --- fs/unionfs/dentry.c | 2 +- fs/unionfs/union.h | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c index f8f65e1..5e498c2 100644 --- a/fs/unionfs/dentry.c +++ b/fs/unionfs/dentry.c @@ -406,7 +406,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 63f3b21..e93b9ef 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -557,24 +557,24 @@ 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 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); -- 1.5.2.2 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html