aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Becker <joel.becker@oracle.com>2010-09-15 16:56:54 -0700
committerJoel Becker <joel.becker@oracle.com>2010-09-15 16:56:54 -0700
commitc0e1a3e80dc030cd54f06416efbf9e439bf6ecb7 (patch)
tree659e4af1bc80c9b14458cfcfae87a35fe196e8bf
parent5e98d492406818e6a94c0ba54c61f59d40cefa4a (diff)
downloadkernel_samsung_smdk4412-c0e1a3e80dc030cd54f06416efbf9e439bf6ecb7.zip
kernel_samsung_smdk4412-c0e1a3e80dc030cd54f06416efbf9e439bf6ecb7.tar.gz
kernel_samsung_smdk4412-c0e1a3e80dc030cd54f06416efbf9e439bf6ecb7.tar.bz2
ocfs2: Silence unused warning.
When CONFIG_OCFS2_DEBUG_MASKLOG is undefined, we don't use the dentry variable in ocfs2_sync_file(). Let's just move all access to the dentry inside the logging call. Signed-off-by: Joel Becker <joel.becker@oracle.com>
-rw-r--r--fs/ocfs2/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 9a74542..13af993 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -174,12 +174,12 @@ static int ocfs2_sync_file(struct file *file, int datasync)
{
int err = 0;
journal_t *journal;
- struct dentry *dentry = file->f_path.dentry;
struct inode *inode = file->f_mapping->host;
struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);
- mlog_entry("(0x%p, 0x%p, %d, '%.*s')\n", file, dentry, datasync,
- dentry->d_name.len, dentry->d_name.name);
+ mlog_entry("(0x%p, %d, 0x%p, '%.*s')\n", file, datasync,
+ file->f_path.dentry, file->f_path.dentry->d_name.len,
+ file->f_path.dentry->d_name.name);
if (datasync && !(inode->i_state & I_DIRTY_DATASYNC)) {
/*