From 5562112199a44701d1f2f7a7631d2f76cedb18e2 Mon Sep 17 00:00:00 2001
From: Wengang Wang <wen.gang.wang@oracle.com>
Date: Tue, 9 Feb 2010 14:57:45 +0800
Subject: [PATCH] --- yaml --- r: 185433 b: refs/heads/master c:
 96a1cc731adb28dc4feb71701091b80e67d486a7 h: refs/heads/master i:   185431:
 ead4a0207a142fd63dc1951e9053d449555ab7f8 v: v3

---
 [refs]                | 2 +-
 trunk/fs/ocfs2/file.c | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d883ffc58189..f1c3882756a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b89c54282db0c8634a2d2dc200f196d571750ce5
+refs/heads/master: 96a1cc731adb28dc4feb71701091b80e67d486a7
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 558ce0312421..da097bd07b72 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -1836,6 +1836,8 @@ static int ocfs2_prepare_inode_for_write(struct dentry *dentry,
 							       &meta_level);
 			if (has_refcount)
 				*has_refcount = 1;
+			if (direct_io)
+				*direct_io = 0;
 		}
 
 		if (ret < 0) {
@@ -1859,10 +1861,6 @@ static int ocfs2_prepare_inode_for_write(struct dentry *dentry,
 			break;
 		}
 
-		if (has_refcount && *has_refcount == 1) {
-			*direct_io = 0;
-			break;
-		}
 		/*
 		 * Allowing concurrent direct writes means
 		 * i_size changes wouldn't be synchronized, so