smbd: brl_lock() never sees blocking locks anymore

This is now all handled in protocol-specific layers

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 b4628831f5b7a05bbc1b4c97c193bf465586f436..7d67f271ab234451b64497274ce887d48303fbd7 100644 (file)
--- 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 b628556d5b97b9b31770d365617c25d75f8df685..2f8938586998fee2d642addb4c8f2c3e63ff2f17 100644 (file)
--- 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 69c6889f89f69f1cddfb6a6d7904bb53a2793898..8ea4f9fa3940bbe4f9cd2b9923f31ed2385d696e 100644 (file)
--- 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,