smbd: Remove unused "msg_ctx" from do_lock()

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

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 5b91aa89f26e7499ba27a04df7d1848f46ea4f44..b6f937df013bceadfa766d361248f65debef4afc 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -230,8 +230,7 @@ static void decrement_current_lock_count(files_struct *fsp,
  Utility function called by locking requests.
 ****************************************************************************/
 
-NTSTATUS do_lock(struct messaging_context *msg_ctx,
-                files_struct *fsp,
+NTSTATUS do_lock(files_struct *fsp,
                 uint64_t smblctx,
                 uint64_t count,
                 uint64_t offset,

diff --git a/source3/locking/proto.h b/source3/locking/proto.h
index 0d1d367fbabc98fceab7b02a000b8eae45b08da7..88af69f4c9144629c1b282c0650dfdb709838f8d 100644 (file)
--- a/source3/locking/proto.h
+++ b/source3/locking/proto.h
@@ -99,8 +99,7 @@ NTSTATUS query_lock(files_struct *fsp,
                        uint64_t *poffset,
                        enum brl_type *plock_type,
                        enum brl_flavour lock_flav);
-NTSTATUS do_lock(struct messaging_context *msg_ctx,
-                files_struct *fsp,
+NTSTATUS do_lock(files_struct *fsp,
                 uint64_t smblctx,
                 uint64_t count,
                 uint64_t offset,

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index bf87de5c5f64f27ccdd3bb57b4b21fbb9fca95d1..78ea514046455d1264a834c2974d0cc9421e2696 100644 (file)
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -2745,7 +2745,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
        if (access_mask & FILE_READ_DATA) {
                off = access_to_netatalk_brl(fork_type, FILE_READ_DATA);
                status = do_lock(
-                       handle->conn->sconn->msg_ctx,
                        fsp,
                        fsp->op->global->open_persistent_id,
                        1,
@@ -2763,7 +2762,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
        if (!share_for_read) {
                off = denymode_to_netatalk_brl(fork_type, DENY_READ);
                status = do_lock(
-                       handle->conn->sconn->msg_ctx,
                        fsp,
                        fsp->op->global->open_persistent_id,
                        1,
@@ -2781,7 +2779,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
        if (access_mask & FILE_WRITE_DATA) {
                off = access_to_netatalk_brl(fork_type, FILE_WRITE_DATA);
                status = do_lock(
-                       handle->conn->sconn->msg_ctx,
                        fsp,
                        fsp->op->global->open_persistent_id,
                        1,
@@ -2799,7 +2796,6 @@ static NTSTATUS fruit_check_access(vfs_handle_struct *handle,
        if (!share_for_write) {
                off = denymode_to_netatalk_brl(fork_type, DENY_WRITE);
                status = do_lock(
-                       handle->conn->sconn->msg_ctx,
                        fsp,
                        fsp->op->global->open_persistent_id,
                        1,

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index d7f071aa7be0436098909ad0115cb4d4fce0f703..a0b8a1e8ea721147bb8b0b1d94cf350e1df5ac06 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -61,7 +61,6 @@ NTSTATUS smbd_do_locks_try(
                struct smbd_lock_element *e = &locks[i];
 
                status = do_lock(
-                       msg_ctx,
                        fsp,
                        e->smblctx,
                        e->count,