git.samba.org
/
kai
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ef45279
)
s3:smbd/blocking: use talloc_get_type_abort() as private_data can't be NULL
author
Stefan Metzmacher
<metze@samba.org>
Wed, 14 Dec 2011 08:50:24 +0000
(09:50 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Wed, 14 Dec 2011 11:00:07 +0000
(12:00 +0100)
metze
source3/smbd/blocking.c
patch
|
blob
|
history
diff --git
a/source3/smbd/blocking.c
b/source3/smbd/blocking.c
index ad1bbe3a91d4dbf3c9141a1b06cdfbe0ffc3a009..cd6967e3441c0a9180260d0524914a0e76759cd7 100644
(file)
--- 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 =
DATA_BLOB *data)
{
struct smbd_server_connection *sconn =
- talloc_get_type(private_data,
+ talloc_get_type
_abort
(private_data,
struct smbd_server_connection);
struct smbd_server_connection);
- if (sconn == NULL) {
- return;
- }
-
DEBUG(10,("received_unlock_msg\n"));
process_blocking_lock_queue(sconn);
}
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 =
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);
struct smbd_server_connection);
- if (sconn == NULL) {
- return;
- }
-
if (data->data == NULL) {
smb_panic("process_blocking_lock_cancel_message: null msg");
}
if (data->data == NULL) {
smb_panic("process_blocking_lock_cancel_message: null msg");
}