git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dd48e0a
)
s3: Remove smbd_messaging_context() from blocking_lock_cancel_smb1()
author
Volker Lendecke
<vl@samba.org>
Sun, 4 Jul 2010 16:40:57 +0000
(18:40 +0200)
committer
Volker Lendecke
<vl@samba.org>
Mon, 5 Jul 2010 09:06:28 +0000
(11:06 +0200)
source3/smbd/blocking.c
patch
|
blob
|
history
diff --git
a/source3/smbd/blocking.c
b/source3/smbd/blocking.c
index 164a078fc96f62d0b15144f507b45ee470dab995..7b04cde4958dd27053f3bc2ea8a2e4e07d492a90 100644
(file)
--- a/
source3/smbd/blocking.c
+++ b/
source3/smbd/blocking.c
@@
-865,7
+865,7
@@
struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp,
if (!sconn->smb1.locks.blocking_lock_cancel_state) {
/* Register our message. */
if (!sconn->smb1.locks.blocking_lock_cancel_state) {
/* Register our message. */
- messaging_register(s
mbd_messaging_context()
, NULL,
+ messaging_register(s
conn->msg_ctx
, NULL,
MSG_SMB_BLOCKING_LOCK_CANCEL,
process_blocking_lock_cancel_message);
MSG_SMB_BLOCKING_LOCK_CANCEL,
process_blocking_lock_cancel_message);
@@
-901,7
+901,7
@@
struct blocking_lock_record *blocking_lock_cancel_smb1(files_struct *fsp,
memcpy(msg, &blr, sizeof(blr));
memcpy(&msg[sizeof(blr)], &err, sizeof(NTSTATUS));
memcpy(msg, &blr, sizeof(blr));
memcpy(&msg[sizeof(blr)], &err, sizeof(NTSTATUS));
- messaging_send_buf(s
mbd_messaging_context()
, procid_self(),
+ messaging_send_buf(s
conn->msg_ctx
, procid_self(),
MSG_SMB_BLOCKING_LOCK_CANCEL,
(uint8 *)&msg, sizeof(msg));
MSG_SMB_BLOCKING_LOCK_CANCEL,
(uint8 *)&msg, sizeof(msg));