diff options
author | Coly Li <coly.li@suse.de> | 2010-03-25 17:15:12 -0400 |
---|---|---|
committer | Joel Becker <joel.becker@oracle.com> | 2010-03-30 15:52:13 -0400 |
commit | a03ab788d070c256eff1ac24cf0e3bc2ca148096 (patch) | |
tree | f5c05f87457be0f863e69915fa4888bec071f6ad | |
parent | efd647f744f3cf504ed83580274bd4b6918139fe (diff) |
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.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 17947dc8341e..2b4235c5831d 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c | |||
@@ -2021,9 +2021,9 @@ out_dio: | |||
2021 | if (ret < 0) | 2021 | if (ret < 0) |
2022 | written = ret; | 2022 | written = ret; |
2023 | 2023 | ||
2024 | if (!ret && (old_size != i_size_read(inode) || | 2024 | if (!ret && ((old_size != i_size_read(inode)) || |
2025 | old_clusters != OCFS2_I(inode)->ip_clusters || | 2025 | (old_clusters != OCFS2_I(inode)->ip_clusters) || |
2026 | has_refcount)) { | 2026 | has_refcount)) { |
2027 | ret = jbd2_journal_force_commit(osb->journal->j_journal); | 2027 | ret = jbd2_journal_force_commit(osb->journal->j_journal); |
2028 | if (ret < 0) | 2028 | if (ret < 0) |
2029 | written = ret; | 2029 | written = ret; |