Messages in this thread | | | Date | Wed, 25 Nov 2009 09:50:06 +0100 | From | Jan Kara <> | Subject | Re: linux-next: manual merge of the ext3 tree with the cifs tree |
| |
Hi,
On Wed 25-11-09 14:06:26, Stephen Rothwell wrote: > 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. Thanks for notification and fixup.
> Just context changes. I fixed it up (see below) and can carry the fix as > necessary. Looking at the code, I don't see an easy way of resolving this by changing either mine or CIFS tree - I have other patches depending on this and this patch depending on others and I assume it's similar with CIFS... So I guess we'll have to live with this conflict.
Honza
> 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;
| |