From 6aa914d08c9ff0e471717aa67b3baf3b23276d78 Mon Sep 17 00:00:00 2001 From: Erez_Zadok Date: Thu, 20 Sep 2007 00:59:05 -0400 Subject: [PATCH] Unionfs: display informational messages only if debug is on This is to avoid filling the console/logs with messages that are primarily of debugging use. Signed-off-by: Erez Zadok --- fs/unionfs/commonfops.c | 4 ++-- fs/unionfs/dentry.c | 6 +++--- fs/unionfs/union.h | 4 ++++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fs/unionfs/commonfops.c b/fs/unionfs/commonfops.c index 87cbb09e249..e69ccf6587d 100644 --- a/fs/unionfs/commonfops.c +++ b/fs/unionfs/commonfops.c @@ -394,8 +394,8 @@ int unionfs_file_revalidate(struct file *file, bool willwrite) if (willwrite && IS_WRITE_FLAG(file->f_flags) && !IS_WRITE_FLAG(unionfs_lower_file(file)->f_flags) && is_robranch(dentry)) { - printk(KERN_DEBUG "unionfs: do delay copyup of \"%s\"\n", - dentry->d_name.name); + dprintk(KERN_DEBUG "unionfs: do delay copyup of \"%s\"\n", + dentry->d_name.name); err = do_delayed_copyup(file); } diff --git a/fs/unionfs/dentry.c b/fs/unionfs/dentry.c index 9e0742d8ebb..08b572267db 100644 --- a/fs/unionfs/dentry.c +++ b/fs/unionfs/dentry.c @@ -46,9 +46,9 @@ static bool __unionfs_d_revalidate_one(struct dentry *dentry, /* if the dentry is unhashed, do NOT revalidate */ if (d_deleted(dentry)) { - printk(KERN_DEBUG "unionfs: unhashed dentry being " - "revalidated: %*s\n", - dentry->d_name.len, dentry->d_name.name); + dprintk(KERN_DEBUG "unionfs: unhashed dentry being " + "revalidated: %*s\n", + dentry->d_name.len, dentry->d_name.name); goto out; } diff --git a/fs/unionfs/union.h b/fs/unionfs/union.h index 7285ea721d0..9ec5f82f378 100644 --- a/fs/unionfs/union.h +++ b/fs/unionfs/union.h @@ -511,6 +511,8 @@ static inline void unionfs_mntput(struct dentry *dentry, int bindex) #ifdef CONFIG_UNION_FS_DEBUG +#define dprintk printk + /* useful for tracking code reachability */ #define UDBG printk("DBG:%s:%s:%d\n",__FILE__,__FUNCTION__,__LINE__) @@ -547,6 +549,8 @@ extern void __show_inode_counts(const struct inode *inode, #else /* not CONFIG_UNION_FS_DEBUG */ +#define dprintk(x...) do { ; } while (0) + /* we leave useful hooks for these check functions throughout the code */ #define unionfs_check_inode(i) do { } while(0) #define unionfs_check_dentry(d) do { } while(0) -- 2.43.0