linux-next: manual merge of the ext3 tree with the cifs tree

[Stephen Rothwell]

Hi Jan,

Today's linux-next merge of the ext3 tree got a conflict in fs/cifs/dir.c
between commit cea62343956c24452700c06cf028b72414c58a74 ("[CIFS]
Duplicate data on appending to some Samba servers") from the cifs tree
and commit 618903228b94b67a1d04634a83ea9cdb99c09e37 ("vfs: Implement
proper O_SYNC semantics") from the ext3 tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc fs/cifs/dir.c
index 1f42f77,f1fe5cb..0000000
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
@@@ -214,7 -214,10 +214,8 @@@ int cifs_posix_open(char *full_path, st
  		posix_flags |= SMB_O_EXCL;
  	if (oflags & O_TRUNC)
  		posix_flags |= SMB_O_TRUNC;
- 	if (oflags & O_SYNC)
 -	if (oflags & O_APPEND)
 -		posix_flags |= SMB_O_APPEND;
+ 	/* be safe and imply O_SYNC for O_DSYNC */
+ 	if (oflags & O_DSYNC)
  		posix_flags |= SMB_O_SYNC;
  	if (oflags & O_DIRECTORY)
  		posix_flags |= SMB_O_DIRECTORY;
--
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/