aboutsummaryrefslogtreecommitdiff
path: root/fs/smbfs_common
diff options
context:
space:
mode:
authorGravatar Steve French <stfrench@microsoft.com> 2023-04-28 00:21:10 -0500
committerGravatar Steve French <stfrench@microsoft.com> 2023-04-28 22:50:16 -0500
commit1149c8467ddebfb6bb9aab37830f70a49cab7085 (patch)
treef2e02a42f7939624ff0b18c5574d585b633e7bd7 /fs/smbfs_common
parentSMB3.1.1: add new tree connect ShareFlags (diff)
downloadlinux-1149c8467ddebfb6bb9aab37830f70a49cab7085.tar.gz
linux-1149c8467ddebfb6bb9aab37830f70a49cab7085.tar.bz2
linux-1149c8467ddebfb6bb9aab37830f70a49cab7085.zip
smb3: make query_on_disk_id open context consistent and move to common code
cifs and ksmbd were using a slightly different version of the query_on_disk_id struct which could be confusing. Use the ksmbd version of this struct, and move it to common code. Reviewed-by: Paulo Alcantara (SUSE) <pc@manguebit.com> Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/smbfs_common')
-rw-r--r--fs/smbfs_common/smb2pdu.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/fs/smbfs_common/smb2pdu.h b/fs/smbfs_common/smb2pdu.h
index 334f11ed5146..43c92e898ee9 100644
--- a/fs/smbfs_common/smb2pdu.h
+++ b/fs/smbfs_common/smb2pdu.h
@@ -1181,6 +1181,7 @@ struct create_posix {
#define SMB2_LEASE_KEY_SIZE 16
+/* See MS-SMB2 2.2.13.2.8 */
struct lease_context {
__u8 LeaseKey[SMB2_LEASE_KEY_SIZE];
__le32 LeaseState;
@@ -1188,6 +1189,7 @@ struct lease_context {
__le64 LeaseDuration;
} __packed;
+/* See MS-SMB2 2.2.13.2.10 */
struct lease_context_v2 {
__u8 LeaseKey[SMB2_LEASE_KEY_SIZE];
__le32 LeaseState;
@@ -1211,6 +1213,15 @@ struct create_lease_v2 {
__u8 Pad[4];
} __packed;
+/* See MS-SMB2 2.2.14.2.9 */
+struct create_disk_id_rsp {
+ struct create_context ccontext;
+ __u8 Name[8];
+ __le64 DiskFileId;
+ __le64 VolumeId;
+ __u8 Reserved[16];
+} __packed;
+
/* See MS-SMB2 2.2.31 and 2.2.32 */
struct smb2_ioctl_req {
struct smb2_hdr hdr;