summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Ross <gwr@nexenta.com>2016-01-13 16:43:42 -0500
committerGordon Ross <gwr@nexenta.com>2019-05-19 19:20:04 -0400
commit58ccc3dc6cf31bbb97afd9f13137fe67844f1c95 (patch)
tree2bf27002967512891f20975441190219ddd8f52b
parent3cc23d49ba5cd4f88efdb1edefd25a61de55f098 (diff)
downloadillumos-joyent-58ccc3dc6cf31bbb97afd9f13137fe67844f1c95.tar.gz
10967 Deleting directory over SMB2 fails after visiting in explorer
Reviewed by: Kevin Crowe <kevin.crowe@nexenta.com> Reviewed by: Matt Barden <Matt.Barden@nexenta.com> Approved by: Joshua M. Clulow <josh@sysmgr.org>
-rw-r--r--usr/src/uts/common/fs/smbsrv/smb2_dispatch.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c b/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
index 7513984acd..249e2fbd47 100644
--- a/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
+++ b/usr/src/uts/common/fs/smbsrv/smb2_dispatch.c
@@ -10,7 +10,7 @@
*/
/*
- * Copyright 2015 Nexenta Systems, Inc. All rights reserved.
+ * Copyright 2016 Nexenta Systems, Inc. All rights reserved.
*/
@@ -958,10 +958,6 @@ smb2sr_go_async(smb_request_t *sr,
* Turn on the "async" flag for both the (synchronous)
* interim response and the (later) async response,
* by storing that in flags before coping into ar.
- *
- * The "related" flag should always be off for the
- * async part because we're no longer operating on a
- * sequence of commands when we execute that.
*/
sr->smb2_hdr_flags |= SMB2_FLAGS_ASYNC_COMMAND;
sr->smb2_async_id = (uintptr_t)ar;
@@ -971,8 +967,7 @@ smb2sr_go_async(smb_request_t *sr,
ar->ar_cmd_len = sr->smb_data.max_bytes - sr->smb2_cmd_hdr;
ar->ar_cmd_code = sr->smb2_cmd_code;
- ar->ar_hdr_flags = sr->smb2_hdr_flags &
- ~SMB2_FLAGS_RELATED_OPERATIONS;
+ ar->ar_hdr_flags = sr->smb2_hdr_flags;
ar->ar_messageid = sr->smb2_messageid;
ar->ar_pid = sr->smb_pid;
ar->ar_tid = sr->smb_tid;