Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[karo-tx-linux.git] / fs / cifs / smb2pdu.h

diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 2022c542ea3aa65ddf15cf511ee652d3040b73a2..69f3595d3952b74a595650103a791aec839f69a5 100644 (file)
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -183,8 +183,6 @@ struct smb2_symlink_err_rsp {
 
 #define SMB2_CLIENT_GUID_SIZE 16
 
-extern __u8 cifs_client_guid[SMB2_CLIENT_GUID_SIZE];
-
 struct smb2_negotiate_req {
        struct smb2_hdr hdr;
        __le16 StructureSize; /* Must be 36 */
@@ -437,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;