diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-10 11:43:18 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-10 11:43:18 -0800 |
commit | 79a64063a84fda220115181fea803c1ae60b4149 (patch) | |
tree | 1f81a94c6cd912f3b3ad33913b2cf8152ed3795a /fs | |
parent | 820b7c717f09ea5f024f2185e69e2847fd2851dd (diff) | |
parent | d243af7ab9feb49f11f2c0050d2077e2d9556f9b (diff) | |
download | linux-79a64063a84fda220115181fea803c1ae60b4149.tar.bz2 |
Merge tag '5.4-rc7-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs fix from Steve French:
"Small fix for an smb3 reconnect bug (also marked for stable)"
* tag '5.4-rc7-smb3-fix' of git://git.samba.org/sfrench/cifs-2.6:
SMB3: Fix persistent handles reconnect
Diffstat (limited to 'fs')
-rw-r--r-- | fs/cifs/smb2pdu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h index ea735d59c36e..0abfde6d0b05 100644 --- a/fs/cifs/smb2pdu.h +++ b/fs/cifs/smb2pdu.h @@ -838,6 +838,7 @@ struct create_durable_handle_reconnect_v2 { struct create_context ccontext; __u8 Name[8]; struct durable_reconnect_context_v2 dcontext; + __u8 Pad[4]; } __packed; /* See MS-SMB2 2.2.13.2.5 */ |