s3:smbd/oplock: pass smbd_server_connection to onefs_init_kernel_oplocks()

[kai/samba.git] / source3 / smbd / oplock.c

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 2d3ce5feaf3433fbf75efb7bc0a7b4f8006ec5ae..a414b72d3134fed4ed6aa44cad32f1b47ca7bd1b 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -354,9 +354,9 @@ static void add_oplock_timeout_handler(files_struct *fsp)
        }
 
        fsp->oplock_timeout =
-               event_add_timed(server_event_context(), fsp,
-                               timeval_current_ofs(OPLOCK_BREAK_TIMEOUT, 0),
-                               oplock_timeout_handler, fsp);
+               tevent_add_timer(fsp->conn->sconn->ev_ctx, fsp,
+                                timeval_current_ofs(OPLOCK_BREAK_TIMEOUT, 0),
+                                oplock_timeout_handler, fsp);
 
        if (fsp->oplock_timeout == NULL) {
                DEBUG(0, ("Could not add oplock timeout handler\n"));
@@ -436,18 +436,18 @@ void process_oplock_async_level2_break_message(struct messaging_context *msg_ctx
                                                      struct server_id src,
                                                      DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn;
        struct share_mode_entry msg;
        files_struct *fsp;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
 
-       if (data->data == NULL) {
-               DEBUG(0, ("Got NULL buffer\n"));
+       if (sconn == NULL) {
                return;
        }
 
-       sconn = msg_ctx_to_sconn(msg_ctx);
-       if (sconn == NULL) {
-               DEBUG(1, ("could not find sconn\n"));
+       if (data->data == NULL) {
+               DEBUG(0, ("Got NULL buffer\n"));
                return;
        }
 
@@ -487,19 +487,19 @@ static void process_oplock_break_message(struct messaging_context *msg_ctx,
                                         struct server_id src,
                                         DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn;
        struct share_mode_entry msg;
        files_struct *fsp;
        bool break_to_level2 = False;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
 
-       if (data->data == NULL) {
-               DEBUG(0, ("Got NULL buffer\n"));
+       if (sconn == NULL) {
                return;
        }
 
-       sconn = msg_ctx_to_sconn(msg_ctx);
-       if (sconn == NULL) {
-               DEBUG(1, ("could not find sconn\n"));
+       if (data->data == NULL) {
+               DEBUG(0, ("Got NULL buffer\n"));
                return;
        }
 
@@ -594,10 +594,16 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
                                        struct server_id src,
                                        DATA_BLOB *data)
 {
-       struct smbd_server_connection *sconn;
        struct file_id id;
        unsigned long file_id;
        files_struct *fsp;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
+
+       if (sconn == NULL) {
+               return;
+       }
 
        if (data->data == NULL) {
                DEBUG(0, ("Got NULL buffer\n"));
@@ -609,12 +615,6 @@ static void process_kernel_oplock_break(struct messaging_context *msg_ctx,
                return;
        }
 
-       sconn = msg_ctx_to_sconn(msg_ctx);
-       if (sconn == NULL) {
-               DEBUG(1, ("could not find sconn\n"));
-               return;
-       }
-
        /* Pull the data from the message. */
        pull_file_id_24((char *)data->data, &id);
        file_id = (unsigned long)IVAL(data->data, 24);
@@ -691,7 +691,13 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx,
                                          DATA_BLOB *data)
 {
        struct share_mode_entry msg;
-       struct smbd_server_connection *sconn;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
+
+       if (sconn == NULL) {
+               return;
+       }
 
        if (data->data == NULL) {
                DEBUG(0, ("Got NULL buffer\n"));
@@ -713,10 +719,7 @@ static void process_oplock_break_response(struct messaging_context *msg_ctx,
                   (unsigned long long)msg.share_file_id,
                   (unsigned long long)msg.op_mid));
 
-       sconn = msg_ctx_to_sconn(msg_ctx);
-       if (sconn != NULL) {
-               schedule_deferred_open_message_smb(sconn, msg.op_mid);
-       }
+       schedule_deferred_open_message_smb(sconn, msg.op_mid);
 }
 
 static void process_open_retry_message(struct messaging_context *msg_ctx,
@@ -726,7 +729,13 @@ static void process_open_retry_message(struct messaging_context *msg_ctx,
                                       DATA_BLOB *data)
 {
        struct share_mode_entry msg;
-       struct smbd_server_connection *sconn;
+       struct smbd_server_connection *sconn =
+               talloc_get_type(private_data,
+               struct smbd_server_connection);
+
+       if (sconn == NULL) {
+               return;
+       }
 
        if (data->data == NULL) {
                DEBUG(0, ("Got NULL buffer\n"));
@@ -745,10 +754,7 @@ static void process_open_retry_message(struct messaging_context *msg_ctx,
                   server_id_str(talloc_tos(), &src), file_id_string_tos(&msg.id),
                   (unsigned long long)msg.op_mid));
 
-       sconn = msg_ctx_to_sconn(msg_ctx);
-       if (sconn != NULL) {
-               schedule_deferred_open_message_smb(sconn, msg.op_mid);
-       }
+       schedule_deferred_open_message_smb(sconn, msg.op_mid);
 }
 
 /****************************************************************************
@@ -930,29 +936,29 @@ 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, sconn, MSG_SMB_BREAK_REQUEST,
                           process_oplock_break_message);
-       messaging_register(msg_ctx, NULL, MSG_SMB_ASYNC_LEVEL2_BREAK,
+       messaging_register(sconn->msg_ctx, sconn, 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, sconn, MSG_SMB_BREAK_RESPONSE,
                           process_oplock_break_response);
-       messaging_register(msg_ctx, NULL, MSG_SMB_KERNEL_BREAK,
+       messaging_register(sconn->msg_ctx, sconn, MSG_SMB_KERNEL_BREAK,
                           process_kernel_oplock_break);
-       messaging_register(msg_ctx, NULL, MSG_SMB_OPEN_RETRY,
+       messaging_register(sconn->msg_ctx, sconn, MSG_SMB_OPEN_RETRY,
                           process_open_retry_message);
 
        if (lp_kernel_oplocks()) {
 #if HAVE_KERNEL_OPLOCKS_IRIX
-               koplocks = irix_init_kernel_oplocks(NULL);
+               koplocks = irix_init_kernel_oplocks(sconn);
 #elif HAVE_KERNEL_OPLOCKS_LINUX
-               koplocks = linux_init_kernel_oplocks(NULL);
+               koplocks = linux_init_kernel_oplocks(sconn);
 #elif HAVE_ONEFS
 #error Isilon, please check if the NULL context is okay here. Thanks!
-               koplocks = onefs_init_kernel_oplocks(NULL);
+               koplocks = onefs_init_kernel_oplocks(sconn);
 #endif
        }