diff options
| author | Volker Lendecke <vl@samba.org> | 2019-06-20 20:58:42 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-06-20 23:39:34 +0000 |
| commit | d4ace83baaa47fe36dd4b0ab9472933ef09b4eb6 (patch) | |
| tree | ca61b23fcad18ff08137e6f54323e5b55839c401 | |
| parent | 4bbe291efcb389715651b2eb94330b6c36f83030 (diff) | |
| download | samba-d4ace83baaa47fe36dd4b0ab9472933ef09b4eb6.tar.gz | |
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
| -rw-r--r-- | source3/include/locking.h | 20 | ||||
| -rw-r--r-- | source3/include/vfs.h | 1 | ||||
| -rw-r--r-- | source3/smbd/smb2_lock.c | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/source3/include/locking.h b/source3/include/locking.h index 4cb75202d1a..3e7560bef9e 100644 --- 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 4727fc029da..67cbe758674 100644 --- 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 cbde4413e69..7d983cc3456 100644 --- 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; }; |