From 500d703977ab7ec2f617ca0f88ed979a7115be36 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Dec 2011 09:50:24 +0100 Subject: [PATCH] s3:smbd/blocking: use talloc_get_type_abort() as private_data can't be NULL metze --- source3/smbd/blocking.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index ad1bbe3a91d..cd6967e3441 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -703,13 +703,9 @@ static void received_unlock_msg(struct messaging_context *msg, DATA_BLOB *data) { struct smbd_server_connection *sconn = - talloc_get_type(private_data, + talloc_get_type_abort(private_data, struct smbd_server_connection); - if (sconn == NULL) { - return; - } - DEBUG(10,("received_unlock_msg\n")); process_blocking_lock_queue(sconn); } @@ -832,13 +828,9 @@ static void process_blocking_lock_cancel_message(struct messaging_context *ctx, const char *msg = (const char *)data->data; struct blocking_lock_record *blr; 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) { smb_panic("process_blocking_lock_cancel_message: null msg"); } -- 2.34.1