smbd: Remove unused "msg_ctx" from brl_lock()

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 743360a5a19665f228214b1e10ebdc4ffacccc09..bd2dfa252db06e99d0e6b7f86c92f45f6475af4a 100644 (file)
--- a/source3/locking/brlock.c
+++ b/source3/locking/brlock.c
@@ -901,16 +901,16 @@ NTSTATUS smb_vfs_call_brl_lock_windows(struct vfs_handle_struct *handle,
  Lock a range of bytes.
 ****************************************************************************/
 
-NTSTATUS brl_lock(struct messaging_context *msg_ctx,
-               struct byte_range_lock *br_lck,
-               uint64_t smblctx,
-               struct server_id pid,
-               br_off start,
-               br_off size,
-               enum brl_type lock_type,
-               enum brl_flavour lock_flav,
-               struct server_id *blocker_pid,
-               uint64_t *psmblctx)
+NTSTATUS brl_lock(
+       struct byte_range_lock *br_lck,
+       uint64_t smblctx,
+       struct server_id pid,
+       br_off start,
+       br_off size,
+       enum brl_type lock_type,
+       enum brl_flavour lock_flav,
+       struct server_id *blocker_pid,
+       uint64_t *psmblctx)
 {
        NTSTATUS ret;
        struct lock_struct lock;

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 2f8938586998fee2d642addb4c8f2c3e63ff2f17..5b91aa89f26e7499ba27a04df7d1848f46ea4f44 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -278,7 +278,6 @@ NTSTATUS do_lock(struct messaging_context *msg_ctx,
        }
 
        status = brl_lock(
-               msg_ctx,
                br_lck,
                smblctx,
                messaging_server_id(fsp->conn->sconn->msg_ctx),

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 7bb21cffc230c14b7641bd7743f141b3e3d0a354..0d1d367fbabc98fceab7b02a000b8eae45b08da7 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -37,16 +37,16 @@ void brl_set_num_read_oplocks(struct byte_range_lock *brl,
 NTSTATUS brl_lock_windows_default(struct byte_range_lock *br_lck,
                                  struct lock_struct *plock);
 
-NTSTATUS brl_lock(struct messaging_context *msg_ctx,
-               struct byte_range_lock *br_lck,
-               uint64_t smblctx,
-               struct server_id pid,
-               br_off start,
-               br_off size,
-               enum brl_type lock_type,
-               enum brl_flavour lock_flav,
-               struct server_id *blocker_pid,
-               uint64_t *psmblctx);
+NTSTATUS brl_lock(
+       struct byte_range_lock *br_lck,
+       uint64_t smblctx,
+       struct server_id pid,
+       br_off start,
+       br_off size,
+       enum brl_type lock_type,
+       enum brl_flavour lock_flav,
+       struct server_id *blocker_pid,
+       uint64_t *psmblctx);
 bool brl_unlock(struct messaging_context *msg_ctx,
                struct byte_range_lock *br_lck,
                uint64_t smblctx,