summaryrefslogtreecommitdiff
path: root/source3/smbd/blocking.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-14 09:50:24 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-14 12:00:07 +0100
commit500d703977ab7ec2f617ca0f88ed979a7115be36 (patch)
treed1f225d671fa1dfe02d9a33362d6a0c1531843f6 /source3/smbd/blocking.c
parentef45279f5e2e78e448c96ae63b9c35302132306f (diff)
downloadsamba-500d703977ab7ec2f617ca0f88ed979a7115be36.tar.gz
samba-500d703977ab7ec2f617ca0f88ed979a7115be36.tar.bz2
samba-500d703977ab7ec2f617ca0f88ed979a7115be36.zip
s3:smbd/blocking: use talloc_get_type_abort() as private_data can't be NULL
metze
Diffstat (limited to 'source3/smbd/blocking.c')
-rw-r--r--source3/smbd/blocking.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index ad1bbe3a91..cd6967e344 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");
}