From e2c5ad2c21bd0be5e2379d4054d8efd043268138 Mon Sep 17 00:00:00 2001
From: Tristan Ye <tristan.ye@oracle.com>
Date: Thu, 19 Aug 2010 15:15:00 +0800
Subject: [PATCH] --- yaml --- r: 210388 b: refs/heads/master c:
 81c8c82b5a39f9127e8b239e9b406a6c3a41b228 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2fa30e0ff3ab..03e5f973cabf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b4c0ff32ccd87ab52d4c5bd0a0536febce11370
+refs/heads/master: 81c8c82b5a39f9127e8b239e9b406a6c3a41b228
diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c
index 2caa3a7a1a39..9a03c151b5ce 100644
--- a/trunk/fs/ocfs2/file.c
+++ b/trunk/fs/ocfs2/file.c
@@ -2338,7 +2338,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb,
 	BUG_ON(ret == -EIOCBQUEUED && !(file->f_flags & O_DIRECT));
 
 	if (((file->f_flags & O_DSYNC) && !direct_io) || IS_SYNC(inode) ||
-	    ((file->f_flags & O_DIRECT) && has_refcount)) {
+	    ((file->f_flags & O_DIRECT) && !direct_io)) {
 		ret = filemap_fdatawrite_range(file->f_mapping, pos,
 					       pos + count - 1);
 		if (ret < 0)