s3:smbd: s/struct event_context/struct tevent_context

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/include/smb.h b/source3/include/smb.h
index a163e9e5cac5f3b2f235bc1f2f07b51d9fb5f03f..0d16e565e5ab49c540acf1fff7a5a9c577b226b2 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -144,7 +144,7 @@ struct notify_event;
 struct notify_change_request;
 struct sys_notify_backend;
 struct sys_notify_context {
-       struct event_context *ev;
+       struct tevent_context *ev;
        void *private_data;     /* For use by the system backend */
 };
 

diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 95d6c330a0ec7760d3105e8561f234a729dae115..1bef73b69725e9949b5241731616ff9c4a40038b 100644 (file)
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -35,7 +35,7 @@ static void received_unlock_msg(struct messaging_context *msg,
                                struct server_id server_id,
                                DATA_BLOB *data);
 
-void brl_timeout_fn(struct event_context *event_ctx,
+void brl_timeout_fn(struct tevent_context *event_ctx,
                           struct timed_event *te,
                           struct timeval now,
                           void *private_data)

diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c
index 631a9a1e0d65128d0de43a0099f8306f46b5514f..409924d384c91484bf5b05f434a84652c6d849e2 100644 (file)
--- a/source3/smbd/fileio.c
+++ b/source3/smbd/fileio.c
@@ -164,7 +164,7 @@ static int wcp_file_size_change(files_struct *fsp)
        return ret;
 }
 
-void update_write_time_handler(struct event_context *ctx,
+void update_write_time_handler(struct tevent_context *ctx,
                                      struct timed_event *te,
                                      struct timeval now,
                                      void *private_data)

diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c
index 73e25b7c92538f7b559f49e79ea027a2d8e19e4d..4842d6f2fcb33b4a1ba34e404fa6a6666cb87c76 100644 (file)
--- a/source3/smbd/notify.c
+++ b/source3/smbd/notify.c
@@ -570,7 +570,7 @@ char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter)
 }
 
 struct sys_notify_context *sys_notify_context_create(TALLOC_CTX *mem_ctx,
-                                                    struct event_context *ev)
+                                                    struct tevent_context *ev)
 {
        struct sys_notify_context *ctx;
 

diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index 7f463a156fcf53a7e7fe245fd05399935016ca72..bfa41c9940bdf7371d81ebd1603873f92b27974c 100644 (file)
--- a/source3/smbd/notify_inotify.c
+++ b/source3/smbd/notify_inotify.c
@@ -190,7 +190,7 @@ static void inotify_dispatch(struct inotify_private *in,
 /*
   called when the kernel has some events for us
 */
-static void inotify_handler(struct event_context *ev, struct fd_event *fde,
+static void inotify_handler(struct tevent_context *ev, struct fd_event *fde,
                            uint16_t flags, void *private_data)
 {
        struct inotify_private *in = talloc_get_type(private_data,

diff --git a/source3/smbd/notify_internal.c b/source3/smbd/notify_internal.c
index 938c57b574a28fe24903da2b06b19b3cf5cba8c6..803e2d913e31e3f26ec31f72d3c90fece9b4e6a2 100644 (file)
--- a/source3/smbd/notify_internal.c
+++ b/source3/smbd/notify_internal.c
@@ -121,7 +121,7 @@ static void notify_handler(struct messaging_context *msg_ctx,
 
 struct notify_context *notify_init(TALLOC_CTX *mem_ctx,
                                   struct messaging_context *msg,
-                                  struct event_context *ev)
+                                  struct tevent_context *ev)
 {
        struct loadparm_context *lp_ctx;
        struct notify_context *notify;

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 406ffd1e3d4666140cd47476978aa901835d55f2..6245817fd3f1f2c04c0dbe10b1c7cb8b23fd949b 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -320,7 +320,7 @@ static files_struct *initial_break_processing(
        return fsp;
 }
 
-static void oplock_timeout_handler(struct event_context *ctx,
+static void oplock_timeout_handler(struct tevent_context *ctx,
                                   struct timed_event *te,
                                   struct timeval now,
                                   void *private_data)

diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index aa987fccbb84f0651a05902434feef49ae0a3756..ea439452c007762a77ae9c306e015011e804a597 100644 (file)
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -276,7 +276,7 @@ static void irix_release_kernel_oplock(struct kernel_oplocks *_ctx,
        }
 }
 
-static void irix_oplocks_read_fde_handler(struct event_context *ev,
+static void irix_oplocks_read_fde_handler(struct tevent_context *ev,
                                          struct fd_event *fde,
                                          uint16_t flags,
                                          void *private_data)

diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 0d815f1885c124e9a23025f504441086adf141d5..73f68c02ec6f771921cc9e492da444173be900bb 100644 (file)
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -581,7 +581,7 @@ static void process_smb(struct smbd_server_connection *conn,
                        uint32_t seqnum, bool encrypted,
                        struct smb_perfcount_data *deferred_pcd);
 
-static void smbd_deferred_open_timer(struct event_context *ev,
+static void smbd_deferred_open_timer(struct tevent_context *ev,
                                     struct timed_event *te,
                                     struct timeval _tval,
                                     void *private_data)
@@ -2428,7 +2428,7 @@ process:
                    seqnum, encrypted, NULL);
 }
 
-static void smbd_server_connection_handler(struct event_context *ev,
+static void smbd_server_connection_handler(struct tevent_context *ev,
                                           struct fd_event *fde,
                                           uint16_t flags,
                                           void *private_data)
@@ -2446,7 +2446,7 @@ static void smbd_server_connection_handler(struct event_context *ev,
        }
 }
 
-static void smbd_server_echo_handler(struct event_context *ev,
+static void smbd_server_echo_handler(struct tevent_context *ev,
                                     struct fd_event *fde,
                                     uint16_t flags,
                                     void *private_data)

diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h
index 603114ecc9de984905d170a1dae1febb55e523b6..6588f30e95c1234607ee1638b98ebadfdb839ca8 100644 (file)
--- a/source3/smbd/proto.h
+++ b/source3/smbd/proto.h
@@ -92,7 +92,7 @@ bool cancel_smb2_aio(struct smb_request *smbreq);
 
 /* The following definitions come from smbd/blocking.c  */
 
-void brl_timeout_fn(struct event_context *event_ctx,
+void brl_timeout_fn(struct tevent_context *event_ctx,
                struct timed_event *te,
                struct timeval now,
                void *private_data);
@@ -314,7 +314,7 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, uint32 dosmode);
 /* The following definitions come from smbd/fileio.c  */
 
 ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n);
-void update_write_time_handler(struct event_context *ctx,
+void update_write_time_handler(struct tevent_context *ctx,
                                       struct timed_event *te,
                                       struct timeval now,
                                       void *private_data);
@@ -534,7 +534,7 @@ void notify_fname(connection_struct *conn, uint32 action, uint32 filter,
                  const char *path);
 char *notify_filter_string(TALLOC_CTX *mem_ctx, uint32 filter);
 struct sys_notify_context *sys_notify_context_create(TALLOC_CTX *mem_ctx,
-                                                    struct event_context *ev);
+                                                    struct tevent_context *ev);
 
 /* The following definitions come from smbd/notify_inotify.c  */
 
@@ -552,7 +552,7 @@ NTSTATUS inotify_watch(struct sys_notify_context *ctx,
 
 struct notify_context *notify_init(TALLOC_CTX *mem_ctx,
                                   struct messaging_context *messaging_ctx,
-                                  struct event_context *ev);
+                                  struct tevent_context *ev);
 NTSTATUS notify_add(struct notify_context *notify,
                    const char *path, uint32_t filter, uint32_t subdir_filter,
                    void (*callback)(void *, const struct notify_event *),

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 57fe7b6455af2715f0e22d88128ada216518d3a7..b8c876750d55ae83e2d9b441baa2a907e43e72f7 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -80,7 +80,7 @@ struct smbd_child_pid {
 extern void start_epmd(struct tevent_context *ev_ctx,
                       struct messaging_context *msg_ctx);
 
-extern void start_lsasd(struct event_context *ev_ctx,
+extern void start_lsasd(struct tevent_context *ev_ctx,
                        struct messaging_context *msg_ctx);
 
 #ifdef WITH_DFS
@@ -394,7 +394,7 @@ static void add_child_pid(struct smbd_parent_context *parent,
   network outage).  
 */
 
-static void cleanup_timeout_fn(struct event_context *event_ctx,
+static void cleanup_timeout_fn(struct tevent_context *event_ctx,
                                struct timed_event *te,
                                struct timeval now,
                                void *private_data)

diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 21f25494c70ac429a941379ad501b06bde39c533..3fe901d2a2be164815ff458f97dc4046d62309dc 100644 (file)
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -1343,7 +1343,7 @@ bool schedule_deferred_open_message_smb2(
  Re-process this call.
 *********************************************************/
 
-static void smb2_deferred_open_timer(struct event_context *ev,
+static void smb2_deferred_open_timer(struct tevent_context *ev,
                                        struct timed_event *te,
                                        struct timeval _tval,
                                        void *private_data)