diff options
| author | Pavel Shilovsky <pshilov@microsoft.com> | 2019-11-13 02:16:35 +0100 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2019-11-25 08:14:53 +0100 |
| commit | 44805b0e62f15e90d233485420e1847133716bdc (patch) | |
| tree | 0de17086e2c5ec81a80f0b9b0d92c460e8f89e86 | |
| parent | smb3: remove confusing dmesg when mounting with encryption ("seal") (diff) | |
| download | linux-44805b0e62f15e90d233485420e1847133716bdc.tar.xz linux-44805b0e62f15e90d233485420e1847133716bdc.zip | |
CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
Currently the client translates O_SYNC and O_DIRECT flags
into corresponding SMB create options when openning a file.
The problem is that on reconnect when the file is being
re-opened the client doesn't set those flags and it causes
a server to reject re-open requests because create options
don't match. The latter means that any subsequent system
call against that open file fail until a share is re-mounted.
Fix this by properly setting SMB create options when
re-openning files after reconnects.
Fixes: 1013e760d10e6: ("SMB3: Don't ignore O_SYNC/O_DSYNC and O_DIRECT flags")
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
| -rw-r--r-- | fs/cifs/file.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 67e7d0ffe385..7713177e08f9 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -728,6 +728,13 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) if (backup_cred(cifs_sb)) create_options |= CREATE_OPEN_BACKUP_INTENT; + /* O_SYNC also has bit for O_DSYNC so following check picks up either */ + if (cfile->f_flags & O_SYNC) + create_options |= CREATE_WRITE_THROUGH; + + if (cfile->f_flags & O_DIRECT) + create_options |= CREATE_NO_BUFFER; + if (server->ops->get_lease_key) server->ops->get_lease_key(inode, &cfile->fid); |