smbd: Remove unused "msg_ctx" from smbd_do_locks_try()
authorVolker Lendecke <vl@samba.org>
Mon, 1 Jul 2019 13:41:07 +0000 (15:41 +0200)
committerJeremy Allison <jra@samba.org>
Tue, 2 Jul 2019 17:01:28 +0000 (17:01 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/blocking.c
source3/smbd/proto.h
source3/smbd/smb2_lock.c

index 982829a5a666743c3aeb0ffa3b039c5355c19c66..d096cd5e8efd53f2b1943fa038d0b359a1609db9 100644 (file)
@@ -45,7 +45,6 @@ struct timeval timeval_brl_min(const struct timeval *tv1,
 }
 
 NTSTATUS smbd_do_locks_try(
-       struct messaging_context *msg_ctx,
        struct files_struct *fsp,
        enum brl_flavour lock_flav,
        uint16_t num_locks,
@@ -190,7 +189,6 @@ struct tevent_req *smbd_smb1_do_locks_send(
        }
 
        status = smbd_do_locks_try(
-               state->msg_ctx,
                state->fsp,
                state->lock_flav,
                state->num_locks,
@@ -364,7 +362,6 @@ static void smbd_smb1_do_locks_retry(struct tevent_req *subreq)
        }
 
        status = smbd_do_locks_try(
-               retry_state->msg_ctx,
                fsp,
                retry_state->lock_flav,
                retry_state->num_locks,
index 112acfa4ad409a604b3ee259a5d439530d1881de..b0e6f89bd804bcbc1d7a496dbc0c5ac4900c3e93 100644 (file)
@@ -98,7 +98,6 @@ bool aio_add_req_to_fsp(files_struct *fsp, struct tevent_req *req);
 struct timeval timeval_brl_min(const struct timeval *tv1,
                        const struct timeval *tv2);
 NTSTATUS smbd_do_locks_try(
-       struct messaging_context *msg_ctx,
        struct files_struct *fsp,
        enum brl_flavour lock_flav,
        uint16_t num_locks,
index 7d983cc3456de7cd25d7a85513883f1d476dac8a..36ec36301b11d18fbefab8834eb7186b3f84bab0 100644 (file)
@@ -369,7 +369,6 @@ static struct tevent_req *smbd_smb2_lock_send(TALLOC_CTX *mem_ctx,
        }
 
        status = smbd_do_locks_try(
-               state->smb1req->sconn->msg_ctx,
                state->fsp,
                WINDOWS_LOCK,
                state->lock_count,
@@ -436,7 +435,6 @@ static void smbd_smb2_lock_retry(struct tevent_req *subreq)
        }
 
        status = smbd_do_locks_try(
-               state->smb1req->sconn->msg_ctx,
                state->fsp,
                WINDOWS_LOCK,
                state->lock_count,