| From 0d369acda1792c79ab932f894e9ce91591b4931e Mon Sep 17 00:00:00 2001 |
| From: Pavel Shilovsky <pshilov@microsoft.com> |
| Date: Tue, 12 Nov 2019 17:16:35 -0800 |
| Subject: [PATCH] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect |
| |
| commit 44805b0e62f15e90d233485420e1847133716bdc upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/cifs/file.c b/fs/cifs/file.c |
| index c9abc789c6b5..b971f7a79481 100644 |
| --- a/fs/cifs/file.c |
| +++ b/fs/cifs/file.c |
| @@ -729,6 +729,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); |
| |
| -- |
| 2.7.4 |
| |
