diff --git a/[refs] b/[refs] index 446c36f1d4b4..3e285a5d5ddf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbe0e331fdbdb256943499358c75bc098a2134c1 +refs/heads/master: 66b116c9d8f70baadf5b2145dddb35af222df041 diff --git a/trunk/fs/ocfs2/file.c b/trunk/fs/ocfs2/file.c index da097bd07b72..c8a4a2939e55 100644 --- a/trunk/fs/ocfs2/file.c +++ b/trunk/fs/ocfs2/file.c @@ -2041,7 +2041,7 @@ static ssize_t ocfs2_file_aio_write(struct kiocb *iocb, * async dio is going to do it in the future or an end_io after an * error has already done it. */ - if (ret == -EIOCBQUEUED || !ocfs2_iocb_is_rw_locked(iocb)) { + if ((ret == -EIOCBQUEUED) || (!ocfs2_iocb_is_rw_locked(iocb))) { rw_level = -1; have_alloc_sem = 0; }