diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index d096cd5e8ef..ffc3142b74c 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -115,7 +115,6 @@ static bool smbd_smb1_fsp_add_blocked_lock_req( struct smbd_smb1_do_locks_state { struct tevent_context *ev; - struct messaging_context *msg_ctx; struct smb_request *smbreq; struct files_struct *fsp; struct timeval endtime; @@ -133,7 +132,6 @@ static void smbd_smb1_blocked_locks_cleanup( struct tevent_req *smbd_smb1_do_locks_send( TALLOC_CTX *mem_ctx, struct tevent_context *ev, - struct messaging_context *msg_ctx, struct smb_request **smbreq, /* talloc_move()d into our state */ struct files_struct *fsp, uint32_t timeout, @@ -157,7 +155,6 @@ struct tevent_req *smbd_smb1_do_locks_send( return NULL; } state->ev = ev; - state->msg_ctx = msg_ctx; state->smbreq = talloc_move(state, smbreq); state->fsp = fsp; state->large_offset = large_offset; diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index b0e6f89bd80..2f28cf2076f 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -108,7 +108,6 @@ NTSTATUS smbd_do_locks_try( struct tevent_req *smbd_smb1_do_locks_send( TALLOC_CTX *mem_ctx, struct tevent_context *ev, - struct messaging_context *msg_ctx, struct smb_request **smbreq, /* talloc_move()d into our state */ struct files_struct *fsp, uint32_t timeout, diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index d2cc2785adb..20e1468f748 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -3796,7 +3796,6 @@ void reply_lockread(struct smb_request *req) subreq = smbd_smb1_do_locks_send( fsp, req->sconn->ev_ctx, - req->sconn->msg_ctx, &req, fsp, 0, @@ -5725,7 +5724,6 @@ void reply_lock(struct smb_request *req) subreq = smbd_smb1_do_locks_send( fsp, req->sconn->ev_ctx, - req->sconn->msg_ctx, &req, fsp, 0, @@ -8480,7 +8478,6 @@ void reply_lockingX(struct smb_request *req) subreq = smbd_smb1_do_locks_send( fsp, req->sconn->ev_ctx, - req->sconn->msg_ctx, &req, fsp, lock_timeout, diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index 4f183ecd601..4342b03a8c9 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -7579,7 +7579,6 @@ static NTSTATUS smb_set_posix_lock(connection_struct *conn, subreq = smbd_smb1_do_locks_send( fsp, req->sconn->ev_ctx, - req->sconn->msg_ctx, &req, fsp, blocking_lock ? UINT32_MAX : 0,