From ec016ee498f0aba763dcff03502a9148f9c58186 Mon Sep 17 00:00:00 2001
From: Hisashi Hifumi <hifumi.hisashi@oss.ntt.co.jp>
Date: Tue, 9 Jun 2009 16:47:45 +0900
Subject: [PATCH] --- yaml --- r: 151225 b: refs/heads/master c:
 e04cc15f52eb072937cec2bbd8499f37afe5e1ef h: refs/heads/master i:   151223:
 e2fbbe25ef55fe46eff8bc3d1d273fb9886dacde v: v3

---
 [refs]                | 2 +-
 trunk/fs/ocfs2/file.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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);