From 831b301fd648563673f95788b3a93c8f5b344641 Mon Sep 17 00:00:00 2001 From: Joel Becker Date: Wed, 15 Sep 2010 16:56:54 -0700 Subject: [PATCH] --- yaml --- r: 212773 b: refs/heads/master c: c0e1a3e80dc030cd54f06416efbf9e439bf6ecb7 h: refs/heads/master i: 212771: e7ddb4373c4090d8bc6e5d797460938e4a219963 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c8c0a64cf20a..c3d946929d8f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5e98d492406818e6a94c0ba54c61f59d40cefa4a +refs/heads/master: c0e1a3e80dc030cd54f06416efbf9e439bf6ecb7 diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index 9a74542e1a05..13af9937bdda 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/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)) { /*