1 files changed, 57 insertions, 4 deletions

diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index b83d0118a757..f88320bbb477 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -122,6 +122,23 @@ struct smb2_pdu {
         __le16 StructureSize2; /* size of wct area (varies, request specific) */
 } __packed;
 
+struct smb2_transform_hdr {
+        __be32 smb2_buf_length; /* big endian on wire */
+                                /* length is only two or three bytes - with
+                                 one or two byte type preceding it that MBZ */
+        __u8   ProtocolId[4];   /* 0xFD 'S' 'M' 'B' */
+        __u8   Signature[16];
+        __u8   Nonce[11];
+        __u8   Reserved[5];
+        __le32 OriginalMessageSize;
+        __u16  Reserved1;
+        __le16 EncryptionAlgorithm;
+        __u64  SessionId;
+} __packed;
+
+/* Encryption Algorithms */
+#define SMB2_ENCRYPTION_AES128_CCM      __constant_cpu_to_le16(0x0001)
+
 /*
  *      SMB2 flag definitions
  */
@@ -237,6 +254,7 @@ struct smb2_sess_setup_req {
 /* Currently defined SessionFlags */
 #define SMB2_SESSION_FLAG_IS_GUEST      0x0001
 #define SMB2_SESSION_FLAG_IS_NULL       0x0002
+#define SMB2_SESSION_FLAG_ENCRYPT_DATA  0x0004
 struct smb2_sess_setup_rsp {
         struct smb2_hdr hdr;
         __le16 StructureSize; /* Must be 9 */
@@ -534,9 +552,16 @@ struct create_durable {
         } Data;
 } __packed;
 
+#define COPY_CHUNK_RES_KEY_SIZE 24
+struct resume_key_req {
+        char ResumeKey[COPY_CHUNK_RES_KEY_SIZE];
+        __le32  ContextLength;  /* MBZ */
+        char    Context[0];     /* ignored, Windows sets to 4 bytes of zero */
+} __packed;
+
 /* this goes in the ioctl buffer when doing a copychunk request */
 struct copychunk_ioctl {
-        char SourceKey[24];
+        char SourceKey[COPY_CHUNK_RES_KEY_SIZE];
         __le32 ChunkCount; /* we are only sending 1 */
         __le32 Reserved;
         /* array will only be one chunk long for us */
@@ -546,6 +571,12 @@ struct copychunk_ioctl {
         __u32 Reserved2;
 } __packed;
 
+struct copychunk_ioctl_rsp {
+        __le32 ChunksWritten;
+        __le32 ChunkBytesWritten;
+        __le32 TotalBytesWritten;
+} __packed;
+
 /* Response and Request are the same format */
 struct validate_negotiate_info {
         __le32 Capabilities;
@@ -569,6 +600,10 @@ struct network_interface_info_ioctl_rsp {
 
 #define NO_FILE_ID 0xFFFFFFFFFFFFFFFFULL /* general ioctls to srv not to file */
 
+struct compress_ioctl {
+        __le16 CompressionState; /* See cifspdu.h for possible flag values */
+} __packed;
+
 struct smb2_ioctl_req {
         struct smb2_hdr hdr;
         __le16 StructureSize;   /* Must be 57 */
@@ -584,7 +619,7 @@ struct smb2_ioctl_req {
         __le32 MaxOutputResponse;
         __le32 Flags;
         __u32  Reserved2;
-        char   Buffer[0];
+        __u8   Buffer[0];
 } __packed;
 
 struct smb2_ioctl_rsp {
@@ -870,14 +905,16 @@ struct smb2_lease_ack {
 
 /* File System Information Classes */
 #define FS_VOLUME_INFORMATION           1 /* Query */
-#define FS_LABEL_INFORMATION            2 /* Set */
+#define FS_LABEL_INFORMATION            2 /* Local only */
 #define FS_SIZE_INFORMATION             3 /* Query */
 #define FS_DEVICE_INFORMATION           4 /* Query */
 #define FS_ATTRIBUTE_INFORMATION        5 /* Query */
 #define FS_CONTROL_INFORMATION          6 /* Query, Set */
 #define FS_FULL_SIZE_INFORMATION        7 /* Query */
 #define FS_OBJECT_ID_INFORMATION        8 /* Query, Set */
-#define FS_DRIVER_PATH_INFORMATION      9 /* Query */
+#define FS_DRIVER_PATH_INFORMATION      9 /* Local only */
+#define FS_VOLUME_FLAGS_INFORMATION     10 /* Local only */
+#define FS_SECTOR_SIZE_INFORMATION      11 /* SMB3 or later. Query */
 
 struct smb2_fs_full_size_info {
         __le64 TotalAllocationUnits;
@@ -887,6 +924,22 @@ struct smb2_fs_full_size_info {
         __le32 BytesPerSector;
 } __packed;
 
+#define SSINFO_FLAGS_ALIGNED_DEVICE             0x00000001
+#define SSINFO_FLAGS_PARTITION_ALIGNED_ON_DEVICE 0x00000002
+#define SSINFO_FLAGS_NO_SEEK_PENALTY            0x00000004
+#define SSINFO_FLAGS_TRIM_ENABLED               0x00000008
+
+/* sector size info struct */
+struct smb3_fs_ss_info {
+        __le32 LogicalBytesPerSector;
+        __le32 PhysicalBytesPerSectorForAtomicity;
+        __le32 PhysicalBytesPerSectorForPerf;
+        __le32 FileSystemEffectivePhysicalBytesPerSectorForAtomicity;
+        __le32 Flags;
+        __le32 ByteOffsetForSectorAlignment;
+        __le32 ByteOffsetForPartitionAlignment;
+} __packed;
+
 /* partial list of QUERY INFO levels */
 #define FILE_DIRECTORY_INFORMATION      1
 #define FILE_FULL_DIRECTORY_INFORMATION 2