summaryrefslogtreecommitdiffstats
path: root/fs/cifs/smb2pdu.h
diff options
context:
space:
mode:
authorRonnie Sahlberg <lsahlber@redhat.com>2018-06-01 10:53:03 +1000
committerSteve French <stfrench@microsoft.com>2018-05-31 21:30:51 -0500
commit0d5a288d25291707bfab128f23585e6d07cf7d42 (patch)
treeb3c82dba1fac4ac165602665dcf5a073911cc245 /fs/cifs/smb2pdu.h
parent977b6170407894fcdd9bf8ea82dac563abda79e7 (diff)
downloadlinux-stable-0d5a288d25291707bfab128f23585e6d07cf7d42.tar.gz
linux-stable-0d5a288d25291707bfab128f23585e6d07cf7d42.tar.bz2
linux-stable-0d5a288d25291707bfab128f23585e6d07cf7d42.zip
cifs: remove struct smb2_oplock_break_rsp
The two structures smb2_oplock_breaq_req/rsp are now basically identical. Replace this with a single definition of a smb2_oplock_break structure. Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com> Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs/cifs/smb2pdu.h')
-rw-r--r--fs/cifs/smb2pdu.h14
1 files changed, 1 insertions, 13 deletions
diff --git a/fs/cifs/smb2pdu.h b/fs/cifs/smb2pdu.h
index 1581dda58730..3448a5d33b67 100644
--- a/fs/cifs/smb2pdu.h
+++ b/fs/cifs/smb2pdu.h
@@ -1165,8 +1165,7 @@ struct smb2_set_info_rsp {
__le16 StructureSize; /* Must be 2 */
} __packed;
-/* oplock break without an rfc1002 header */
-struct smb2_oplock_break_req {
+struct smb2_oplock_break {
struct smb2_sync_hdr sync_hdr;
__le16 StructureSize; /* Must be 24 */
__u8 OplockLevel;
@@ -1176,17 +1175,6 @@ struct smb2_oplock_break_req {
__u64 VolatileFid;
} __packed;
-/* oplock break with an rfc1002 header */
-struct smb2_oplock_break_rsp {
- struct smb2_hdr hdr;
- __le16 StructureSize; /* Must be 24 */
- __u8 OplockLevel;
- __u8 Reserved;
- __le32 Reserved2;
- __u64 PersistentFid;
- __u64 VolatileFid;
-} __packed;
-
#define SMB2_NOTIFY_BREAK_LEASE_FLAG_ACK_REQUIRED cpu_to_le32(0x01)
struct smb2_lease_break {