smbd: Remove unused "blocking_lock" from brl_lock_windows_default()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/locking/brlock.c b/source3/locking/brlock.c
index f3ef909563972a8f18076e11eafa02e02a92db6d..ed15177080e67a373c38fc598e3849d436b1259e 100644 (file)
--- 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 8ea4f9fa3940bbe4f9cd2b9923f31ed2385d696e..7bb21cffc230c14b7641bd7743f141b3e3d0a354 100644 (file)
--- 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 13bfe45527099c6613658cc87baa4563cd4a3545..9359aa48607d3b422f499ca238b56aff6c8800f9 100644 (file)
--- 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,