---

yaml --- r: 185433 b: refs/heads/master c: 96a1cc7 h: refs/heads/master i: 185431: ead4a02 v: v3
git-mirror · Feb 26, 2010 · 5562112 · 5562112
1 parent ccbf5ff
commit 5562112
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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