From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the ocfs2 tree with Linus' tree Date: Fri, 18 Dec 2009 10:51:14 +1100 Message-ID: <20091218105114.947efae9.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from chilli.pcug.org.au ([203.10.76.44]:50091 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752198AbZLQXvQ (ORCPT ); Thu, 17 Dec 2009 18:51:16 -0500 Sender: linux-next-owner@vger.kernel.org List-ID: To: Joel Becker Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Tao Ma , Christoph Hellwig Hi Joel, Today's linux-next merge of the ocfs2 tree got a conflict in fs/ocfs2/file.c between commit 6b2f3d1f769be5779b479c37800229d9a4809fc3 ("vfs: Implement proper O_SYNC semantics") from Linus' tree and commit a8227ccc585025735bcf350f71fa9c1ffd005d8d ("ocfs2: Handle O_DIRECT when writing to a refcounted cluster") from the ocfs2 tree. I fixed it up (see below) and can carry the fix for a while. Since this is a conflict against Linus' tree, it is fixable in the ocfs2 tree by doing a merge with Linus' tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc fs/ocfs2/file.c index 3d30a1c,04e178e..0000000 --- a/fs/ocfs2/file.c +++ b/fs/ocfs2/file.c @@@ -2006,7 -2013,8 +2013,8 @@@ out_dio /* buffered aio wouldn't have proper lock coverage today */ BUG_ON(ret == -EIOCBQUEUED && !(file->f_flags & O_DIRECT)); - if ((file->f_flags & O_DSYNC && !direct_io) || IS_SYNC(inode)) { - if ((file->f_flags & O_SYNC && !direct_io) || IS_SYNC(inode) || ++ if ((file->f_flags & O_DSYNC && !direct_io) || IS_SYNC(inode) || + (file->f_flags & O_DIRECT && has_refcount)) { ret = filemap_fdatawrite_range(file->f_mapping, pos, pos + count - 1); if (ret < 0)