From a045b9b1f37177253a38c348f0d428fe2fdcf607 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 1 Jul 2019 14:58:35 +0200 Subject: [PATCH] smbd: Remove unused "blocking_lock" from brl_lock_windows_default() Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- source3/locking/brlock.c | 2 +- source3/locking/proto.h | 3 +-- source3/modules/vfs_default.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c index f3ef9095639..ed15177080e 100644 --- a/source3/locking/brlock.c +++ b/source3/locking/brlock.c @@ -346,7 +346,7 @@ static int lock_compare(const struct lock_struct *lck1, ****************************************************************************/ NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck, - struct lock_struct *plock, bool blocking_lock) + struct lock_struct *plock) { unsigned int i; files_struct *fsp = br_lck->fsp; diff --git a/source3/locking/proto.h b/source3/locking/proto.h index 8ea4f9fa394..7bb21cffc23 100644 --- a/source3/locking/proto.h +++ b/source3/locking/proto.h @@ -35,8 +35,7 @@ void brl_set_num_read_oplocks(struct byte_range_lock *brl, uint32_t num_read_oplocks); NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck, - struct lock_struct *plock, - bool blocking_lock); + struct lock_struct *plock); NTSTATUS brl_lock(struct messaging_context *msg_ctx, struct byte_range_lock *br_lck, diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index 13bfe455270..9359aa48607 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -2840,7 +2840,7 @@ static NTSTATUS vfswrap_brl_lock_windows(struct vfs_handle_struct *handle, SMB_ASSERT(plock->lock_flav == WINDOWS_LOCK); /* Note: blr is not used in the default implementation. */ - return brl_lock_windows_default(br_lck, plock, false); + return brl_lock_windows_default(br_lck, plock); } static bool vfswrap_brl_unlock_windows(struct vfs_handle_struct *handle, -- 2.47.3