diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-04 07:42:16 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-04 07:42:16 +0100 |
commit | 4906f39a1343713a4fb3fe78aecd12eba5257dc0 (patch) | |
tree | 2487e32b1e02681683a842f26bbc05e9d1aba308 /fs/smb/client/smb2pdu.h | |
parent | af54d778a03853801d681c98c0c2a6c316ef9ca7 (diff) | |
parent | 33cc938e65a98f1d29d0a18403dbbee050dcad9a (diff) |
Merge 6.7-rc4 into char-misc-linus
We need 6.7-rc4 in here as we need to revert one of the debugfs changes
that came in that release through the wireless tree.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/smb/client/smb2pdu.h')
-rw-r--r-- | fs/smb/client/smb2pdu.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h index 220994d0a0f7..db08194484e0 100644 --- a/fs/smb/client/smb2pdu.h +++ b/fs/smb/client/smb2pdu.h @@ -319,13 +319,15 @@ struct smb2_file_reparse_point_info { } __packed; struct smb2_file_network_open_info { - __le64 CreationTime; - __le64 LastAccessTime; - __le64 LastWriteTime; - __le64 ChangeTime; - __le64 AllocationSize; - __le64 EndOfFile; - __le32 Attributes; + struct_group(network_open_info, + __le64 CreationTime; + __le64 LastAccessTime; + __le64 LastWriteTime; + __le64 ChangeTime; + __le64 AllocationSize; + __le64 EndOfFile; + __le32 Attributes; + ); __le32 Reserved; } __packed; /* level 34 Query also similar returned in close rsp and open rsp */ |