smbd: Remove unused "deferred_pcd" from process_smb()
authorVolker Lendecke <vl@samba.org>
Mon, 5 Jun 2023 14:02:29 +0000 (16:02 +0200)
committerJeremy Allison <jra@samba.org>
Mon, 5 Jun 2023 17:17:36 +0000 (17:17 +0000)
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
source3/smbd/proto.h
source3/smbd/smb1_process.c
source3/smbd/smb2_process.c

index 11c5f3a22722022a0f8111adf96061746a9abada..5361678a922b1a77679f5172dbc0af5a830ef415 100644 (file)
@@ -903,9 +903,11 @@ bool create_smb1_outbuf(TALLOC_CTX *mem_ctx, struct smb_request *req,
 void construct_smb1_reply_common_req(struct smb_request *req, char *outbuf);
 void reply_smb1_outbuf(struct smb_request *req, uint8_t num_words, uint32_t num_bytes);
 void process_smb(struct smbXsrv_connection *xconn,
-                uint8_t *inbuf, size_t nread, size_t unread_bytes,
-                uint32_t seqnum, bool encrypted,
-                struct smb_perfcount_data *deferred_pcd);
+                uint8_t *inbuf,
+                size_t nread,
+                size_t unread_bytes,
+                uint32_t seqnum,
+                bool encrypted);
 void smbd_process(struct tevent_context *ev_ctx,
                  struct messaging_context *msg_ctx,
                  int sock_fd,
index ce2fa298f60776029685e919d6dcecd1e27d210a..da7070264b1b24a077c7dd5cf0826b4de09c16f1 100644 (file)
@@ -2080,8 +2080,7 @@ void smbd_smb1_server_connection_read_handler(struct smbXsrv_connection *xconn,
        }
 
 process:
-       process_smb(xconn, inbuf, inbuf_len, unread_bytes,
-                   seqnum, encrypted, NULL);
+       process_smb(xconn, inbuf, inbuf_len, unread_bytes, seqnum, encrypted);
 }
 
 static void smbd_server_echo_handler(struct tevent_context *ev,
index ae0fdee71fcf95870c20362b06f3ca3780caa2f0..968c4ed5027b33134f72a932fc171bc116070a4c 100644 (file)
@@ -268,9 +268,12 @@ static void smbd_deferred_open_timer(struct tevent_context *ev,
         * re-processed in error. */
        msg->processed = true;
 
-       process_smb(xconn, inbuf,
-                   msg->buf.length, 0,
-                   msg->seqnum, msg->encrypted, &msg->pcd);
+       process_smb(xconn,
+                   inbuf,
+                   msg->buf.length,
+                   0,
+                   msg->seqnum,
+                   msg->encrypted);
 
        /* If it's still there and was processed, remove it. */
        msg = get_deferred_open_message_smb(sconn, mid);
@@ -558,9 +561,11 @@ static void process_smb2(struct smbXsrv_connection *xconn,
 }
 
 void process_smb(struct smbXsrv_connection *xconn,
-                uint8_t *inbuf, size_t nread, size_t unread_bytes,
-                uint32_t seqnum, bool encrypted,
-                struct smb_perfcount_data *deferred_pcd)
+                uint8_t *inbuf,
+                size_t nread,
+                size_t unread_bytes,
+                uint32_t seqnum,
+                bool encrypted)
 {
        struct smbd_server_connection *sconn = xconn->client->sconn;
        int msg_type = CVAL(inbuf,0);