From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Joel Becker <Joel.Becker@oracle.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Tao Ma <tao.ma@oracle.com>, Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the ocfs2 tree with Linus' tree
Date: Fri, 18 Dec 2009 10:51:14 +1100 [thread overview]
Message-ID: <20091218105114.947efae9.sfr@canb.auug.org.au> (raw)
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)
next reply other threads:[~2009-12-17 23:51 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-17 23:51 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-03-28 1:00 linux-next: manual merge of the ocfs2 tree with Linus' tree Stephen Rothwell
2010-08-13 0:33 Stephen Rothwell
2009-09-23 0:45 Stephen Rothwell
2009-09-23 3:14 ` Joel Becker
2009-09-23 5:25 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091218105114.947efae9.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Joel.Becker@oracle.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=tao.ma@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).