diff --git a/[refs] b/[refs]
index 13349ad1fe6d..e53347d12968 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06c59bb896ce23c56829f6acf667faebd51dd3b8
+refs/heads/master: e04cc15f52eb072937cec2bbd8499f37afe5e1ef
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 1a96cac31791..07267e0da909 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -187,6 +187,9 @@ static int ocfs2_sync_file(struct file *file,
 	if (err)
 		goto bail;
 
+	if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
+		goto bail;
+
 	journal = osb->journal->j_journal;
 	err = jbd2_journal_force_commit(journal);