Coly Li
2010-Mar-25 21:15 UTC
[Ocfs2-devel] [PATCH] 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 at suse.de> Cc: Joel Becker <joel.becker at oracle.com> --- fs/ocfs2/file.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c index 17947dc..c4638fd 100644 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@ -2021,8 +2021,8 @@ out_dio: if (ret < 0) written = ret; - if (!ret && (old_size != i_size_read(inode) || - old_clusters != OCFS2_I(inode)->ip_clusters || + 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) -- Coly Li SuSE Labs
Joel Becker
2010-Apr-01 00:52 UTC
[Ocfs2-devel] [PATCH] ocfs2: one more warning fix in ocfs2_file_aio_write(), v2
On Fri, Mar 26, 2010 at 05:15:12AM +0800, Coly Li wrote:> 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'.This patch is now in the fixes branch of ocfs2.git. Joel -- "You don't make the poor richer by making the rich poorer." - Sir Winston Churchill Joel Becker Principal Software Developer Oracle E-mail: joel.becker at oracle.com Phone: (650) 506-8127