smbd: Remove unused "msg_ctx" from smbd_smb1_do_locks_send()

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

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index d096cd5e8efd53f2b1943fa038d0b359a1609db9..ffc3142b74c64fef05b87b6209fed2f047677671 100644 (file)
--- 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 b0e6f89bd804bcbc1d7a496dbc0c5ac4900c3e93..2f28cf2076f26011f55b7acdba8c4d5a1c20d757 100644 (file)
--- 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 d2cc2785adb019e3c6d50b0f94d1384d160fa05c..20e1468f748786d9a87c6e94732773acf290914a 100644 (file)
--- 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 4f183ecd6017bb9c54116244e662a91f3307d815..4342b03a8c93525802fe78c7779295c874298b01 100644 (file)
--- 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,