From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 13 Dec 2011 12:18:47 +0000 (+0100)
Subject: s3:smbd/oplock: pass sconn as private_data to process_oplock_break_response()
X-Git-Url: http://git.samba.org/?p=kai%2Fsamba.git;a=commitdiff_plain;h=7fee41cd39afff925ce9af7793736e2444572b58

s3:smbd/oplock: pass sconn as private_data to process_oplock_break_response()

metze
---

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 5806d696144..b23df3fdfa2 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -691,7 +691,13 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx,
 					  DATA_BLOB *data)
 {
 	struct share_mode_entry msg;
-	struct smbd_server_connection *sconn;
+	struct smbd_server_connection *sconn =
+		talloc_get_type(private_data,
+		struct smbd_server_connection);
+
+	if (sconn == NULL) {
+		return;
+	}
 
 	if (data->data == NULL) {
 		DEBUG(0, ("Got NULL buffer\n"));
@@ -713,10 +719,7 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx,
 		   (unsigned long long)msg.share_file_id,
 		   (unsigned long long)msg.op_mid));
 
-	sconn = msg_ctx_to_sconn(msg_ctx);
-	if (sconn != NULL) {
-		schedule_deferred_open_message_smb(sconn, msg.op_mid);
-	}
+	schedule_deferred_open_message_smb(sconn, msg.op_mid);
 }
 
 static void process_open_retry_message(struct messaging_context *msg_ctx,
@@ -938,7 +941,7 @@ bool init_oplocks(struct smbd_server_connection *sconn)
 			   process_oplock_break_message);
 	messaging_register(sconn->msg_ctx, sconn, MSG_SMB_ASYNC_LEVEL2_BREAK,
 			   process_oplock_async_level2_break_message);
-	messaging_register(sconn->msg_ctx, NULL, MSG_SMB_BREAK_RESPONSE,
+	messaging_register(sconn->msg_ctx, sconn, MSG_SMB_BREAK_RESPONSE,
 			   process_oplock_break_response);
 	messaging_register(sconn->msg_ctx, NULL, MSG_SMB_KERNEL_BREAK,
 			   process_kernel_oplock_break);