smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings

[sfrench/cifs-2.6.git] / fs / smb / server / smb2pdu.h

diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h
index bd1d2a0e9203a4b5cb5f6509f738b736e578d91c..643f5e1cfe3570ef9f9eae4ca7c3bb7cfd6adbd5 100644 (file)
--- a/fs/smb/server/smb2pdu.h
+++ b/fs/smb/server/smb2pdu.h
@@ -64,7 +64,7 @@ struct preauth_integrity_info {
 #define SMB2_SESSION_TIMEOUT           (10 * HZ)
 
 struct create_durable_req_v2 {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        __le32 Timeout;
        __le32 Flags;
@@ -73,7 +73,7 @@ struct create_durable_req_v2 {
 } __packed;
 
 struct create_durable_reconn_req {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        union {
                __u8  Reserved[16];
@@ -85,7 +85,7 @@ struct create_durable_reconn_req {
 } __packed;
 
 struct create_durable_reconn_v2_req {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        struct {
                __u64 PersistentFileId;
@@ -96,13 +96,13 @@ struct create_durable_reconn_v2_req {
 } __packed;
 
 struct create_alloc_size_req {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        __le64 AllocationSize;
 } __packed;
 
 struct create_durable_rsp {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        union {
                __u8  Reserved[8];
@@ -114,7 +114,7 @@ struct create_durable_rsp {
 /* Flags */
 #define SMB2_DHANDLE_FLAG_PERSISTENT   0x00000002
 struct create_durable_v2_rsp {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        __le32 Timeout;
        __le32 Flags;
@@ -122,7 +122,7 @@ struct create_durable_v2_rsp {
 
 /* equivalent of the contents of SMB3.1.1 POSIX open context response */
 struct create_posix_rsp {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8    Name[16];
        __le32 nlink;
        __le32 reparse_tag;
@@ -381,13 +381,13 @@ struct smb2_ea_info {
 } __packed; /* level 15 Query */
 
 struct create_ea_buf_req {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        struct smb2_ea_info ea;
 } __packed;
 
 struct create_sd_buf_req {
-       struct create_context ccontext;
+       struct create_context_hdr ccontext;
        __u8   Name[8];
        struct smb_ntsd ntsd;
 } __packed;