mirror of
https://github.com/samba-team/samba.git
synced 2025-08-08 13:49:29 +03:00
smbd: Remove unused blocking_lock_record* from VFS_BRL_LOCK_WINDOWS
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
committed by
Jeremy Allison
parent
e2233fbcee
commit
b08fe2d98d
@ -2205,8 +2205,7 @@ static const char *vfswrap_connectpath(struct vfs_handle_struct *handle,
|
||||
static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle,
|
||||
struct byte_range_lock *br_lck,
|
||||
struct lock_struct *plock,
|
||||
bool blocking_lock,
|
||||
struct blocking_lock_record *blr)
|
||||
bool blocking_lock)
|
||||
{
|
||||
SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK);
|
||||
|
||||
|
@ -1650,13 +1650,12 @@ static const char *smb_full_audit_connectpath(vfs_handle_struct *handle,
|
||||
static NTSTATUS smb_full_audit_brl_lock_windows(struct vfs_handle_struct *handle,
|
||||
struct byte_range_lock *br_lck,
|
||||
struct lock_struct *plock,
|
||||
bool blocking_lock,
|
||||
struct blocking_lock_record *blr)
|
||||
bool blocking_lock)
|
||||
{
|
||||
NTSTATUS result;
|
||||
|
||||
result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock,
|
||||
blocking_lock, blr);
|
||||
blocking_lock);
|
||||
|
||||
do_log(SMB_VFS_OP_BRL_LOCK_WINDOWS, NT_STATUS_IS_OK(result), handle,
|
||||
"%s:%llu-%llu. type=%d. blocking=%d",
|
||||
|
@ -1543,8 +1543,7 @@ static const char *smb_time_audit_connectpath(vfs_handle_struct *handle,
|
||||
static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle,
|
||||
struct byte_range_lock *br_lck,
|
||||
struct lock_struct *plock,
|
||||
bool blocking_lock,
|
||||
struct blocking_lock_record *blr)
|
||||
bool blocking_lock)
|
||||
{
|
||||
NTSTATUS result;
|
||||
struct timespec ts1,ts2;
|
||||
@ -1552,7 +1551,7 @@ static NTSTATUS smb_time_audit_brl_lock_windows(struct vfs_handle_struct *handle
|
||||
|
||||
clock_gettime_mono(&ts1);
|
||||
result = SMB_VFS_NEXT_BRL_LOCK_WINDOWS(handle, br_lck, plock,
|
||||
blocking_lock, blr);
|
||||
blocking_lock);
|
||||
clock_gettime_mono(&ts2);
|
||||
timediff = nsec_time_diff(&ts2,&ts1)*1.0e-9;
|
||||
|
||||
|
Reference in New Issue
Block a user