From: Volker Lendecke <vl@samba.org>
Date: Mon, 5 Jun 2023 14:02:29 +0000 (+0200)
Subject: smbd: Remove unused "deferred_pcd" from process_smb()
X-Git-Tag: talloc-2.4.1~489
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d2dcc0fdf56a473e2a23332d93b8ac64d209efe5;p=thirdparty%2Fsamba.git

smbd: Remove unused "deferred_pcd" from process_smb()

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

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 11c5f3a2272..5361678a922 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -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,
diff --git a/source3/smbd/smb1_process.c b/source3/smbd/smb1_process.c
index ce2fa298f60..da7070264b1 100644
--- a/source3/smbd/smb1_process.c
+++ b/source3/smbd/smb1_process.c
@@ -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,
diff --git a/source3/smbd/smb2_process.c b/source3/smbd/smb2_process.c
index ae0fdee71fc..968c4ed5027 100644
--- a/source3/smbd/smb2_process.c
+++ b/source3/smbd/smb2_process.c
@@ -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);