smbd: Remove struct blocking_lock_record

Forgot that one in the last patches

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jun 20 23:39:34 UTC 2019 on sn-devel-184

diff --git a/source3/include/locking.h b/source3/include/locking.h
index 4cb75202d1a17ae6afcfd281fd8c0aade5d20e1a..3e7560bef9ecc1ec0c3bfe6dcd9367ae2373b512 100644 (file)
--- a/source3/include/locking.h
+++ b/source3/include/locking.h
@@ -61,26 +61,6 @@ struct lock_struct {
        enum brl_flavour lock_flav;
 };
 
-/****************************************************************************
- This is the structure to queue to implement blocking locks.
-*****************************************************************************/
-
-struct blocking_lock_record {
-       struct blocking_lock_record *next;
-       struct blocking_lock_record *prev;
-       struct files_struct *fsp;
-       struct timeval expire_time;
-       int lock_num;
-       uint64_t offset;
-       uint64_t count;
-       uint64_t smblctx;
-       uint64_t blocking_smblctx; /* Context that blocks us. */
-       enum brl_flavour lock_flav;
-       enum brl_type lock_type;
-       struct smb_request *req;
-       void *blr_private; /* Implementation specific. */
-};
-
 struct smbd_lock_element {
        uint64_t smblctx;
        enum brl_type brltype;

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 4727fc029dad13ab8dfb61ec52ffa44890200440..67cbe758674365c3f3960cfa037be87787651c30 100644 (file)
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -280,7 +280,6 @@ struct vfs_statvfs_struct;
 struct smb_request;
 struct ea_list;
 struct smb_file_time;
-struct blocking_lock_record;
 struct smb_filename;
 struct dfs_GetDFSReferral;
 

diff --git a/source3/smbd/smb2_lock.c b/source3/smbd/smb2_lock.c
index cbde4413e69923c570834871e97c368506341df0..7d983cc3456de7cd25d7a85513883f1d476dac8a 100644 (file)
--- a/source3/smbd/smb2_lock.c
+++ b/source3/smbd/smb2_lock.c
@@ -42,7 +42,6 @@ struct smbd_smb2_lock_state {
        struct smbd_smb2_request *smb2req;
        struct smb_request *smb1req;
        struct files_struct *fsp;
-       struct blocking_lock_record *blr;
        uint16_t lock_count;
        struct smbd_lock_element *locks;
 };