Linux-CIFS Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
@ 2019-11-13  1:16 Pavel Shilovsky
  2019-11-13  3:32 ` Ronnie Sahlberg
  0 siblings, 1 reply; 3+ messages in thread
From: Pavel Shilovsky @ 2019-11-13  1:16 UTC (permalink / raw)
  To: linux-cifs, smfrench

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>
---
 fs/cifs/file.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index b6f544bc6c73..89617bb058ae 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -721,6 +721,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.17.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
  2019-11-13  1:16 [PATCH] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect Pavel Shilovsky
@ 2019-11-13  3:32 ` Ronnie Sahlberg
  2019-11-13  5:36   ` Steve French
  0 siblings, 1 reply; 3+ messages in thread
From: Ronnie Sahlberg @ 2019-11-13  3:32 UTC (permalink / raw)
  To: Pavel Shilovsky; +Cc: linux-cifs, smfrench

Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>


----- Original Message -----
From: "Pavel Shilovsky" <piastryyy@gmail.com>
To: linux-cifs@vger.kernel.org, smfrench@gmail.com
Sent: Wednesday, 13 November, 2019 11:16:35 AM
Subject: [PATCH] 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>
---
 fs/cifs/file.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index b6f544bc6c73..89617bb058ae 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -721,6 +721,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.17.1


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect
  2019-11-13  3:32 ` Ronnie Sahlberg
@ 2019-11-13  5:36   ` Steve French
  0 siblings, 0 replies; 3+ messages in thread
From: Steve French @ 2019-11-13  5:36 UTC (permalink / raw)
  To: Ronnie Sahlberg; +Cc: Pavel Shilovsky, CIFS

merged into cifs-2.6.git for-next and also updated the github tree
(used by the buildbot e.g.)

On Tue, Nov 12, 2019 at 9:32 PM Ronnie Sahlberg <lsahlber@redhat.com> wrote:
>
> Reviewed-by: Ronnie Sahlberg <lsahlber@redhat.com>
>
>
> ----- Original Message -----
> From: "Pavel Shilovsky" <piastryyy@gmail.com>
> To: linux-cifs@vger.kernel.org, smfrench@gmail.com
> Sent: Wednesday, 13 November, 2019 11:16:35 AM
> Subject: [PATCH] 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>
> ---
>  fs/cifs/file.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/fs/cifs/file.c b/fs/cifs/file.c
> index b6f544bc6c73..89617bb058ae 100644
> --- a/fs/cifs/file.c
> +++ b/fs/cifs/file.c
> @@ -721,6 +721,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.17.1
>


-- 
Thanks,

Steve

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, back to index

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-13  1:16 [PATCH] CIFS: Respect O_SYNC and O_DIRECT flags during reconnect Pavel Shilovsky
2019-11-13  3:32 ` Ronnie Sahlberg
2019-11-13  5:36   ` Steve French

Linux-CIFS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-cifs/0 linux-cifs/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-cifs linux-cifs/ https://lore.kernel.org/linux-cifs \
		linux-cifs@vger.kernel.org
	public-inbox-index linux-cifs

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-cifs


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git