commit 52107c851ed884e833b9eeebc2ef8a677cca3319
Author: Erez Zadok <[EMAIL PROTECTED]>
Date: Wed Jan 9 16:38:27 2008 -0500
Unionfs: merged several printk KERN_CONT together into one pr_debug
CC: Joe Perches <[EMAIL PROTECTED]>
Signed-off-by: Erez Zadok <[EMAIL PROTECTED]>
diff --git a/fs/unionfs/debug.c b/fs/unionfs/debug.c
index 5e1864b..c352b4d 100644
--- a/fs/unionfs/debug.c
+++ b/fs/unionfs/debug.c
@@ -455,16 +455,16 @@ void __show_inode_times(const struct inode *inode,
lower_inode = unionfs_lower_inode_idx(inode, bindex);
if (unlikely(!lower_inode))
continue;
- pr_debug("IT(%lu:%d): ", inode->i_ino, bindex);
- printk(KERN_CONT "%s:%s:%d ", file, fxn, line);
- printk(KERN_CONT "um=%lu/%lu lm=%lu/%lu ",
- inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec,
- lower_inode->i_mtime.tv_sec,
- lower_inode->i_mtime.tv_nsec);
- printk(KERN_CONT "uc=%lu/%lu lc=%lu/%lu\n",
- inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
- lower_inode->i_ctime.tv_sec,
- lower_inode->i_ctime.tv_nsec);
+ pr_debug("IT(%lu:%d): %s:%s:%d "
+ "um=%lu/%lu lm=%lu/%lu uc=%lu/%lu lc=%lu/%lu\n",
+ inode->i_ino, bindex,
+ file, fxn, line,
+ inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec,
+ lower_inode->i_mtime.tv_sec,
+ lower_inode->i_mtime.tv_nsec,
+ inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
+ lower_inode->i_ctime.tv_sec,
+ lower_inode->i_ctime.tv_nsec);
}
}
@@ -479,17 +479,16 @@ void __show_dinode_times(const struct dentry *dentry,
lower_inode = unionfs_lower_inode_idx(inode, bindex);
if (!lower_inode)
continue;
- pr_debug("DT(%s:%lu:%d): ", dentry->d_name.name, inode->i_ino,
- bindex);
- printk(KERN_CONT "%s:%s:%d ", file, fxn, line);
- printk(KERN_CONT "um=%lu/%lu lm=%lu/%lu ",
- inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec,
- lower_inode->i_mtime.tv_sec,
- lower_inode->i_mtime.tv_nsec);
- printk(KERN_CONT "uc=%lu/%lu lc=%lu/%lu\n",
- inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
- lower_inode->i_ctime.tv_sec,
- lower_inode->i_ctime.tv_nsec);
+ pr_debug("DT(%s:%lu:%d): %s:%s:%d "
+ "um=%lu/%lu lm=%lu/%lu uc=%lu/%lu lc=%lu/%lu\n",
+ dentry->d_name.name, inode->i_ino, bindex,
+ file, fxn, line,
+ inode->i_mtime.tv_sec, inode->i_mtime.tv_nsec,
+ lower_inode->i_mtime.tv_sec,
+ lower_inode->i_mtime.tv_nsec,
+ inode->i_ctime.tv_sec, inode->i_ctime.tv_nsec,
+ lower_inode->i_ctime.tv_sec,
+ lower_inode->i_ctime.tv_nsec);
}
}
@@ -508,10 +507,10 @@ void __show_inode_counts(const struct inode *inode,
lower_inode = unionfs_lower_inode_idx(inode, bindex);
if (unlikely(!lower_inode))
continue;
- printk(KERN_CONT "SIC(%lu:%d:%d): ", inode->i_ino, bindex,
- atomic_read(&(inode)->i_count));
- printk(KERN_CONT "lc=%d ",
- atomic_read(&(lower_inode)->i_count));
- printk(KERN_CONT "%s:%s:%d\n", file, fxn, line);
+ pr_debug("SIC(%lu:%d:%d): lc=%d %s:%s:%d\n",
+ inode->i_ino, bindex,
+ atomic_read(&(inode)->i_count),
+ atomic_read(&(lower_inode)->i_count),
+ file, fxn, line);
}
}
_______________________________________________
unionfs-cvs mailing list: http://unionfs.filesystems.org/
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
