summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-12-13 13:13:53 +0100
committerStefan Metzmacher <metze@samba.org>2011-12-13 20:31:09 +0100
commit21de67357509f18817dd202431017a7aa15e8495 (patch)
tree036019b3650c4616326e30cc748cdee11a0c661b /source3
parent5efd7e16c24ed7d1ab510158ea9b2f6fd0b81922 (diff)
downloadsamba-21de67357509f18817dd202431017a7aa15e8495.tar.gz
samba-21de67357509f18817dd202431017a7aa15e8495.tar.bz2
samba-21de67357509f18817dd202431017a7aa15e8495.zip
s3:smbd/oplock: pass smbd_server_connection to init_oplocks()
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/oplock.c12
-rw-r--r--source3/smbd/process.c2
-rw-r--r--source3/smbd/proto.h2
3 files changed, 8 insertions, 8 deletions
diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 48e8bb5d12..af0d9127be 100644
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -930,19 +930,19 @@ void message_to_share_mode_entry(struct share_mode_entry *e, char *msg)
Setup oplocks for this process.
****************************************************************************/
-bool init_oplocks(struct messaging_context *msg_ctx)
+bool init_oplocks(struct smbd_server_connection *sconn)
{
DEBUG(3,("init_oplocks: initializing messages.\n"));
- messaging_register(msg_ctx, NULL, MSG_SMB_BREAK_REQUEST,
+ messaging_register(sconn->msg_ctx, NULL, MSG_SMB_BREAK_REQUEST,
process_oplock_break_message);
- messaging_register(msg_ctx, NULL, MSG_SMB_ASYNC_LEVEL2_BREAK,
+ messaging_register(sconn->msg_ctx, NULL, MSG_SMB_ASYNC_LEVEL2_BREAK,
process_oplock_async_level2_break_message);
- messaging_register(msg_ctx, NULL, MSG_SMB_BREAK_RESPONSE,
+ messaging_register(sconn->msg_ctx, NULL, MSG_SMB_BREAK_RESPONSE,
process_oplock_break_response);
- messaging_register(msg_ctx, NULL, MSG_SMB_KERNEL_BREAK,
+ messaging_register(sconn->msg_ctx, NULL, MSG_SMB_KERNEL_BREAK,
process_kernel_oplock_break);
- messaging_register(msg_ctx, NULL, MSG_SMB_OPEN_RETRY,
+ messaging_register(sconn->msg_ctx, NULL, MSG_SMB_OPEN_RETRY,
process_open_retry_message);
if (lp_kernel_oplocks()) {
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index ad5c096e05..dffb855f0b 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3131,7 +3131,7 @@ void smbd_process(struct tevent_context *ev_ctx,
}
/* Setup oplocks */
- if (!init_oplocks(sconn->msg_ctx))
+ if (!init_oplocks(sconn))
exit_server("Failed to init oplocks");
/* register our message handlers */
diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index daaa914141..2989cdae4e 100644
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -669,7 +669,7 @@ void smbd_contend_level2_oplocks_end(files_struct *fsp,
enum level2_contention_type type);
void share_mode_entry_to_message(char *msg, const struct share_mode_entry *e);
void message_to_share_mode_entry(struct share_mode_entry *e, char *msg);
-bool init_oplocks(struct messaging_context *msg_ctx);
+bool init_oplocks(struct smbd_server_connection *sconn);
/* The following definitions come from smbd/oplock_irix.c */