s3:smbd/oplock: use talloc_get_type_abort() as private_data can't be NULL
authorStefan Metzmacher <metze@samba.org>
Wed, 14 Dec 2011 08:50:24 +0000 (09:50 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 14 Dec 2011 11:00:07 +0000 (12:00 +0100)
metze

source3/smbd/oplock.c

index a414b72d3134fed4ed6aa44cad32f1b47ca7bd1b..b14c37002070a1b0951e539dfbce11ad55fc629b 100644 (file)
@@ -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;