diff options
| author | Volker Lendecke <vl@samba.org> | 2019-07-01 14:55:42 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2019-07-02 17:01:27 +0000 |
| commit | f83775d8557587c1aa6db031c0b250455d4d7a6b (patch) | |
| tree | 454a00704936aaf44056c3bd10194ae1282f0b07 /source3/locking | |
| parent | 37c9c4c3ce3e26730f79bce5feaf51433bd331f7 (diff) | |
| download | samba-f83775d8557587c1aa6db031c0b250455d4d7a6b.tar.gz | |
vfs: Remove "blocking_lock" from SMB_VFS_BRL_LOCK_WINDOWS
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'source3/locking')
| -rw-r--r-- | source3/locking/brlock.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index 7d67f271ab2..f3ef9095639 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -892,12 +892,10 @@ static NTSTATUS brl_lock_posix(struct messaging_context *msg_ctx, NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle, struct byte_range_lock *br_lck, - struct lock_struct *plock, - bool blocking_lock) + struct lock_struct *plock) { VFS_FIND(brl_lock_windows); - return handle->fns->brl_lock_windows_fn(handle, br_lck, plock, - blocking_lock); + return handle->fns->brl_lock_windows_fn(handle, br_lck, plock); } /**************************************************************************** @@ -939,7 +937,7 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, if (lock_flav == WINDOWS_LOCK) { ret = SMB_VFS_BRL_LOCK_WINDOWS( - br_lck->fsp->conn, br_lck, &lock, false); + br_lck->fsp->conn, br_lck, &lock); } else { ret = brl_lock_posix(msg_ctx, br_lck, &lock); } @@ -948,7 +946,6 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, /* sort the lock list */ TYPESAFE_QSORT(br_lck->lock_data, (size_t)br_lck->num_locks, lock_compare); #endif - /* If we're returning an error, return who blocked us. */ if (!NT_STATUS_IS_OK(ret) && psmblctx) { *blocker_pid = lock.context.pid; |