summaryrefslogtreecommitdiffstats
path: root/fs/direct-io.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2012-06-07 15:45:00 -0700
committerAl Viro <viro@zeniv.linux.org.uk>2012-07-14 16:32:46 +0400
commitd187663ef24cd3d033f0cbf2867e70b36a3a90b8 (patch)
treea3efbbb2655fd932fa3f27888315b91b07bb0710 /fs/direct-io.c
parent3dd847820d138c9d60764b0e920380373285ff10 (diff)
downloadlinux-stable-d187663ef24cd3d033f0cbf2867e70b36a3a90b8.tar.gz
linux-stable-d187663ef24cd3d033f0cbf2867e70b36a3a90b8.tar.bz2
linux-stable-d187663ef24cd3d033f0cbf2867e70b36a3a90b8.zip
fs/direct-io.c: adjust suspicious bit operation
READ is 0, so the result of the bit-and operation is 0. Rewrite with == as done elsewhere in the same file. This problem was found using Coccinelle (http://coccinelle.lip6.fr/). Signed-off-by: Julia Lawall <julia@diku.dk> Reviewed-by: Jeff Moyer <jmoyer@redhat.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/direct-io.c')
-rw-r--r--fs/direct-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 0c85fae37666..1faf4cb56f39 100644
--- a/fs/direct-io.c
+++ b/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)