Clarify SMB2/SMB3 create context and add missing ones

Clarify comments for create contexts which we do send,
and fix typo in one create context definition and add
newer SMB3 create contexts to the list.

Signed-off-by: Steve French <smfrench@gmail.com>

diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 35ddc3e..787844b 100644 (file)
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -1047,6 +1047,7 @@ smb2_create_lease_buf(u8 *lease_key, u8 oplock)
        buf->ccontext.NameOffset = cpu_to_le16(offsetof
                                (struct create_lease, Name));
        buf->ccontext.NameLength = cpu_to_le16(4);
+       /* SMB2_CREATE_REQUEST_LEASE is "RqLs" */
        buf->Name[0] = 'R';
        buf->Name[1] = 'q';
        buf->Name[2] = 'L';
@@ -1073,6 +1074,7 @@ smb3_create_lease_buf(u8 *lease_key, u8 oplock)
        buf->ccontext.NameOffset = cpu_to_le16(offsetof
                                (struct create_lease_v2, Name));
        buf->ccontext.NameLength = cpu_to_le16(4);
+       /* SMB2_CREATE_REQUEST_LEASE is "RqLs" */
        buf->Name[0] = 'R';
        buf->Name[1] = 'q';
        buf->Name[2] = 'L';

diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c
index 0feb743..b0037b6 100644 (file)
--- a/fs/cifs/smb2pdu.c
+++ b/fs/cifs/smb2pdu.c
@@ -972,6 +972,7 @@ create_durable_buf(void)
        buf->ccontext.NameOffset = cpu_to_le16(offsetof
                                (struct create_durable, Name));
        buf->ccontext.NameLength = cpu_to_le16(4);
+       /* SMB2_CREATE_DURABLE_HANDLE_REQUEST is "DHnQ" */
        buf->Name[0] = 'D';
        buf->Name[1] = 'H';
        buf->Name[2] = 'n';
@@ -996,6 +997,7 @@ create_reconnect_durable_buf(struct cifs_fid *fid)
        buf->ccontext.NameLength = cpu_to_le16(4);
        buf->Data.Fid.PersistentFileId = fid->persistent_fid;
        buf->Data.Fid.VolatileFileId = fid->volatile_fid;
+       /* SMB2_CREATE_DURABLE_HANDLE_RECONNECT is "DHnC" */
        buf->Name[0] = 'D';
        buf->Name[1] = 'H';
        buf->Name[2] = 'n';

diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 743e11e..69f3595 100644 (file)
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -435,11 +435,15 @@ struct smb2_tree_disconnect_rsp {
 #define SMB2_CREATE_SD_BUFFER                  "SecD" /* security descriptor */
 #define SMB2_CREATE_DURABLE_HANDLE_REQUEST     "DHnQ"
 #define SMB2_CREATE_DURABLE_HANDLE_RECONNECT   "DHnC"
-#define SMB2_CREATE_ALLOCATION_SIZE            "AlSi"
+#define SMB2_CREATE_ALLOCATION_SIZE            "AISi"
 #define SMB2_CREATE_QUERY_MAXIMAL_ACCESS_REQUEST "MxAc"
 #define SMB2_CREATE_TIMEWARP_REQUEST           "TWrp"
 #define SMB2_CREATE_QUERY_ON_DISK_ID           "QFid"
 #define SMB2_CREATE_REQUEST_LEASE              "RqLs"
+#define SMB2_CREATE_DURABLE_HANDLE_REQUEST_V2  "DH2Q"
+#define SMB2_CREATE_DURABLE_HANDLE_RECONNECT_V2        "DH2C"
+#define SMB2_CREATE_APP_INSTANCE_ID    0x45BCA66AEFA7F74A9008FA462E144D74
+#define SVHDX_OPEN_DEVICE_CONTEXT      0x83CE6F1AD851E0986E34401CC9BCFCE9
 
 struct smb2_create_req {
        struct smb2_hdr hdr;