From de7d6475e9994b4f48ba79b36a3d6317ca1f2f60 Mon Sep 17 00:00:00 2001 From: Tao Ma Date: Wed, 3 Feb 2010 09:56:04 +0800 Subject: [PATCH] --- yaml --- r: 180361 b: refs/heads/master c: 60c486744c9a30ea60fa863e9587242dde2fe4bd h: refs/heads/master i: 180359: fd8f3b44c0ed9d7178240af607fb770fa1cd02e4 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5fd96e2d222f..07c2e75bac51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a1ea437d87af830786605813972e8e277992917 +refs/heads/master: 60c486744c9a30ea60fa863e9587242dde2fe4bd diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index 65e9375d2fb3..558ce0312421 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -2013,8 +2013,8 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, /* buffered aio wouldn't have proper lock coverage today */ 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)) { + if (((file->f_flags & O_DSYNC) && !direct_io) || IS_SYNC(inode) || + ((file->f_flags & O_DIRECT) && has_refcount)) { ret = filemap_fdatawrite_range(file->f_mapping, pos, pos + count - 1); if (ret < 0)