From 2c5ffafebc8abc0dac8be5e36156524a67b365c4 Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Thu, 7 Jun 2012 15:45:00 -0700
Subject: [PATCH] --- yaml --- r: 312869 b: refs/heads/master c:
 d187663ef24cd3d033f0cbf2867e70b36a3a90b8 h: refs/heads/master i:   312867:
 a08f86b249915c81892796f510ddb1870e426bfa v: v3

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

diff --git a/[refs] b/[refs]
index 392a85732013..052475f105f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dd847820d138c9d60764b0e920380373285ff10
+refs/heads/master: d187663ef24cd3d033f0cbf2867e70b36a3a90b8
diff --git a/trunk/fs/direct-io.c b/trunk/fs/direct-io.c
index 0c85fae37666..1faf4cb56f39 100644
--- a/trunk/fs/direct-io.c
+++ b/trunk/fs/direct-io.c
@@ -1258,7 +1258,7 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
 	 */
 	BUG_ON(retval == -EIOCBQUEUED);
 	if (dio->is_async && retval == 0 && dio->result &&
-	    ((rw & READ) || (dio->result == sdio.size)))
+	    ((rw == READ) || (dio->result == sdio.size)))
 		retval = -EIOCBQUEUED;
 
 	if (retval != -EIOCBQUEUED)