linux-next: manual merge of the ocfs2 tree with Linus' tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/