s3:smb2_create: pass smbXsrv_connection to *deferred*_smb2

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

3 files changed, 14 insertions, 15 deletions

diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 02275d8c1e..1a7c803210 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -318,12 +318,12 @@ int map_smb2_oplock_levels_to_samba(uint8_t in_oplock_level);
 bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
 			struct timeval *p_request_time,
 			struct deferred_open_record **open_rec);
-bool open_was_deferred_smb2(struct smbd_server_connection *sconn,
-			    uint64_t mid);
+bool open_was_deferred_smb2(
+	struct smbXsrv_connection *xconn, uint64_t mid);
 void remove_deferred_open_message_smb2(
-	struct smbd_server_connection *sconn, uint64_t mid);
+	struct smbXsrv_connection *xconn, uint64_t mid);
 bool schedule_deferred_open_message_smb2(
-	struct smbd_server_connection *sconn, uint64_t mid);
+	struct smbXsrv_connection *xconn, uint64_t mid);
 bool push_deferred_open_message_smb2(struct smbd_smb2_request *smb2req,
                                 struct timeval request_time,
                                 struct timeval timeout,
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 4da6b75862..23ebd948de 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -768,7 +768,7 @@ void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
 	struct pending_message_list *pml;
 
 	if (sconn->using_smb2) {
-		remove_deferred_open_message_smb2(sconn, mid);
+		remove_deferred_open_message_smb2(xconn, mid);
 		return;
 	}
 
@@ -798,7 +798,7 @@ bool schedule_deferred_open_message_smb(struct smbXsrv_connection *xconn,
 	int i = 0;
 
 	if (sconn->using_smb2) {
-		return schedule_deferred_open_message_smb2(sconn, mid);
+		return schedule_deferred_open_message_smb2(xconn, mid);
 	}
 
 	for (pml = sconn->deferred_open_queue; pml; pml = pml->next) {
@@ -861,7 +861,7 @@ bool open_was_deferred(struct smbXsrv_connection *xconn, uint64_t mid)
 	struct pending_message_list *pml;
 
 	if (sconn->using_smb2) {
-		return open_was_deferred_smb2(sconn, mid);
+		return open_was_deferred_smb2(xconn, mid);
 	}
 
 	for (pml = sconn->deferred_open_queue; pml; pml = pml->next) {
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 3225a82a53..48bc48674c 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1212,9 +1212,8 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req,
 *********************************************************/
 
 static struct smbd_smb2_request *find_open_smb2req(
-	struct smbd_server_connection *sconn, uint64_t mid)
+	struct smbXsrv_connection *xconn, uint64_t mid)
 {
-	struct smbXsrv_connection *xconn = sconn->conn;
 	struct smbd_smb2_request *smb2req;
 
 	for (smb2req = xconn->smb2.requests; smb2req; smb2req = smb2req->next) {
@@ -1235,12 +1234,12 @@ static struct smbd_smb2_request *find_open_smb2req(
 	return NULL;
 }
 
-bool open_was_deferred_smb2(struct smbd_server_connection *sconn, uint64_t mid)
+bool open_was_deferred_smb2(struct smbXsrv_connection *xconn, uint64_t mid)
 {
 	struct smbd_smb2_create_state *state = NULL;
 	struct smbd_smb2_request *smb2req;
 
-	smb2req = find_open_smb2req(sconn, mid);
+	smb2req = find_open_smb2req(xconn, mid);
 
 	if (!smb2req) {
 		DEBUG(10,("open_was_deferred_smb2: mid %llu smb2req == NULL\n",
@@ -1298,11 +1297,11 @@ static void remove_deferred_open_message_smb2_internal(struct smbd_smb2_request
 }
 
 void remove_deferred_open_message_smb2(
-	struct smbd_server_connection *sconn, uint64_t mid)
+	struct smbXsrv_connection *xconn, uint64_t mid)
 {
 	struct smbd_smb2_request *smb2req;
 
-	smb2req = find_open_smb2req(sconn, mid);
+	smb2req = find_open_smb2req(xconn, mid);
 
 	if (!smb2req) {
 		DEBUG(10,("remove_deferred_open_message_smb2: "
@@ -1335,12 +1334,12 @@ static void smbd_smb2_create_request_dispatch_immediate(struct tevent_context *c
 }
 
 bool schedule_deferred_open_message_smb2(
-	struct smbd_server_connection *sconn, uint64_t mid)
+	struct smbXsrv_connection *xconn, uint64_t mid)
 {
 	struct smbd_smb2_create_state *state = NULL;
 	struct smbd_smb2_request *smb2req;
 
-	smb2req = find_open_smb2req(sconn, mid);
+	smb2req = find_open_smb2req(xconn, mid);
 
 	if (!smb2req) {
 		DEBUG(10,("schedule_deferred_open_message_smb2: "