summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColy Li <coly.li@suse.de>2010-03-26 05:15:12 +0800
committerJoel Becker <joel.becker@oracle.com>2010-03-30 12:52:13 -0700
commita03ab788d070c256eff1ac24cf0e3bc2ca148096 (patch)
treef5c05f87457be0f863e69915fa4888bec071f6ad
parentefd647f744f3cf504ed83580274bd4b6918139fe (diff)
downloadop-kernel-dev-a03ab788d070c256eff1ac24cf0e3bc2ca148096.zip
op-kernel-dev-a03ab788d070c256eff1ac24cf0e3bc2ca148096.tar.gz
ocfs2: one more warning fix in ocfs2_file_aio_write(), v2
This patch fixes another compiling warning in ocfs2_file_aio_write() like this, fs/ocfs2/file.c: In function ‘ocfs2_file_aio_write’: fs/ocfs2/file.c:2026: warning: suggest parentheses around ‘&&’ within ‘||’ As Joel suggested, '!ret' is unary, this version removes the wrap from '!ret'. Signed-off-by: Coly Li <coly.li@suse.de> Signed-off-by: Joel Becker <joel.becker@oracle.com>
-rw-r--r--fs/ocfs2/file.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 17947dc..2b4235c 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2021,9 +2021,9 @@ out_dio:
if (ret < 0)
written = ret;
- if (!ret && (old_size != i_size_read(inode) ||
- old_clusters != OCFS2_I(inode)->ip_clusters ||
- has_refcount)) {
+ if (!ret && ((old_size != i_size_read(inode)) ||
+ (old_clusters != OCFS2_I(inode)->ip_clusters) ||
+ has_refcount)) {
ret = jbd2_journal_force_commit(osb->journal->j_journal);
if (ret < 0)
written = ret;
OpenPOWER on IntegriCloud