diff options
| -rw-r--r-- | source3/locking/brlock.c | 5 | ||||
| -rw-r--r-- | source3/locking/locking.c | 1 | ||||
| -rw-r--r-- | source3/locking/proto.h | 1 |
3 files changed, 2 insertions, 5 deletions
diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index b4628831f5b..7d67f271ab2 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -912,7 +912,6 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, br_off size, enum brl_type lock_type, enum brl_flavour lock_flav, - bool blocking_lock, struct server_id *blocker_pid, uint64_t *psmblctx) { @@ -939,8 +938,8 @@ 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, blocking_lock); + ret = SMB_VFS_BRL_LOCK_WINDOWS( + br_lck->fsp->conn, br_lck, &lock, false); } else { ret = brl_lock_posix(msg_ctx, br_lck, &lock); } diff --git a/source3/locking/locking.c b/source3/locking/locking.c index b628556d5b9..2f893858699 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -286,7 +286,6 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx, count, lock_type, lock_flav, - false, &blocker_pid, &blocker_smblctx); diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 69c6889f89f..8ea4f9fa394 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -46,7 +46,6 @@ NTSTATUS brl_lock(struct messaging_context *msg_ctx, br_off size, enum brl_type lock_type, enum brl_flavour lock_flav, - bool blocking_lock, struct server_id *blocker_pid, uint64_t *psmblctx); bool brl_unlock(struct messaging_context *msg_ctx, |