From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 14 Dec 2011 08:50:24 +0000 (+0100)
Subject: s3:smbd/oplock: use talloc_get_type_abort() as private_data can't be NULL
X-Git-Url: http://git.samba.org/?p=kai%2Fsamba.git;a=commitdiff_plain;h=dabc2cb9cb10c05e44144bf048277bc8ac62bf77

s3:smbd/oplock: use talloc_get_type_abort() as private_data can't be NULL

metze
---

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index a414b72d313..b14c3700207 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -439,13 +439,9 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx
 	struct share_mode_entry msg;
 	files_struct *fsp;
 	struct smbd_server_connection *sconn =
-		talloc_get_type(private_data,
+		talloc_get_type_abort(private_data,
 		struct smbd_server_connection);
 
-	if (sconn == NULL) {
-		return;
-	}
-
 	if (data->data == NULL) {
 		DEBUG(0, ("Got NULL buffer\n"));
 		return;
@@ -491,13 +487,9 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
 	files_struct *fsp;
 	bool break_to_level2 = False;
 	struct smbd_server_connection *sconn =
-		talloc_get_type(private_data,
+		talloc_get_type_abort(private_data,
 		struct smbd_server_connection);
 
-	if (sconn == NULL) {
-		return;
-	}
-
 	if (data->data == NULL) {
 		DEBUG(0, ("Got NULL buffer\n"));
 		return;
@@ -598,13 +590,9 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
 	unsigned long file_id;
 	files_struct *fsp;
 	struct smbd_server_connection *sconn =
-		talloc_get_type(private_data,
+		talloc_get_type_abort(private_data,
 		struct smbd_server_connection);
 
-	if (sconn == NULL) {
-		return;
-	}
-
 	if (data->data == NULL) {
 		DEBUG(0, ("Got NULL buffer\n"));
 		return;
@@ -692,13 +680,9 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx,
 {
 	struct share_mode_entry msg;
 	struct smbd_server_connection *sconn =
-		talloc_get_type(private_data,
+		talloc_get_type_abort(private_data,
 		struct smbd_server_connection);
 
-	if (sconn == NULL) {
-		return;
-	}
-
 	if (data->data == NULL) {
 		DEBUG(0, ("Got NULL buffer\n"));
 		return;
@@ -730,13 +714,9 @@ static void process_open_retry_message(struct messaging_context *msg_ctx,
 {
 	struct share_mode_entry msg;
 	struct smbd_server_connection *sconn =
-		talloc_get_type(private_data,
+		talloc_get_type_abort(private_data,
 		struct smbd_server_connection);
 
-	if (sconn == NULL) {
-		return;
-	}
-
 	if (data->data == NULL) {
 		DEBUG(0, ("Got NULL buffer\n"));
 		return;