diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-12-14 09:50:24 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-12-14 12:00:07 +0100 |
| commit | dabc2cb9cb10c05e44144bf048277bc8ac62bf77 (patch) | |
| tree | 251ef73e1c83ef5f74a21ba97906266543f63a6b /source3/smbd | |
| parent | 940f21e5c694cf441d6ab19fff87745f2c3a9172 (diff) | |
| download | samba-dabc2cb9cb10c05e44144bf048277bc8ac62bf77.tar.gz samba-dabc2cb9cb10c05e44144bf048277bc8ac62bf77.tar.bz2 samba-dabc2cb9cb10c05e44144bf048277bc8ac62bf77.zip | |
s3:smbd/oplock: use talloc_get_type_abort() as private_data can't be NULL
metze
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/oplock.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index a414b72d31..b14c370020 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; |