From 4729667e9d1861af5230e737eaff4ea15a7faf0c Mon Sep 17 00:00:00 2001 From: Coly Li Date: Fri, 26 Mar 2010 05:15:12 +0800 Subject: [PATCH] --- yaml --- r: 190547 b: refs/heads/master c: a03ab788d070c256eff1ac24cf0e3bc2ca148096 h: refs/heads/master i: 190545: ab8684e93534358aa347e5d3d8b7ce52d7e47115 190543: 54b1688a6eeae99aae3dbe9f4871056c5b4bd215 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/file.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a7c9281b6663..5170e98771d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: efd647f744f3cf504ed83580274bd4b6918139fe +refs/heads/master: a03ab788d070c256eff1ac24cf0e3bc2ca148096 diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index 17947dc8341e..2b4235c5831d 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -2021,9 +2021,9 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, 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;