s3:modules: s/struct fd_event/struct tevent_fd

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

diff --git a/source3/modules/vfs_aio_linux.c b/source3/modules/vfs_aio_linux.c
index a8bc6797035fe9280b377c7f3d4491df41e227fc..618897527e280a5dd29291f757e7b5daa00e449a 100644 (file)
--- a/source3/modules/vfs_aio_linux.c
+++ b/source3/modules/vfs_aio_linux.c
@@ -29,12 +29,12 @@
 
 static int event_fd = -1;
 static io_context_t io_ctx;
-static struct fd_event *aio_read_event;
+static struct tevent_fd *aio_read_event;
 static bool used;
 static unsigned num_busy;
 
 static void aio_linux_done(struct tevent_context *event_ctx,
-                          struct fd_event *event,
+                          struct tevent_fd *event,
                           uint16 flags, void *private_data);
 
 /************************************************************************
@@ -247,7 +247,7 @@ static struct tevent_req *aio_linux_fsync_send(
 }
 
 static void aio_linux_done(struct tevent_context *event_ctx,
-                          struct fd_event *event,
+                          struct tevent_fd *event,
                           uint16 flags, void *private_data)
 {
        uint64_t num_events = 0;

diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c
index aa10921a3de279e8f1b1b647067f47bf9c429508..5642a89e2dc7e54a99954aa0bbcd375b77c729c1 100644 (file)
--- a/source3/modules/vfs_aio_pthread.c
+++ b/source3/modules/vfs_aio_pthread.c
@@ -40,11 +40,11 @@
 static bool init_aio_threadpool(struct tevent_context *ev_ctx,
                                struct pthreadpool **pp_pool,
                                void (*completion_fn)(struct tevent_context *,
-                                               struct fd_event *,
+                                               struct tevent_fd *,
                                                uint16,
                                                void *))
 {
-       struct fd_event *sock_event = NULL;
+       struct tevent_fd *sock_event = NULL;
        int ret = 0;
 
        if (*pp_pool) {
@@ -151,7 +151,7 @@ static struct aio_open_private_data *find_open_private_data_by_mid(uint64_t mid)
 ***********************************************************************/
 
 static void aio_open_handle_completion(struct tevent_context *event_ctx,
-                               struct fd_event *event,
+                               struct tevent_fd *event,
                                uint16 flags,
                                void *p)
 {

diff --git a/source3/modules/vfs_notify_fam.c b/source3/modules/vfs_notify_fam.c
index c456cadd26db4fefa80f83a4599dc8b8a0cc2388..f10a4c9c94376593f496b4a8f3cb4ff0a7322cbe 100644 (file)
--- a/source3/modules/vfs_notify_fam.c
+++ b/source3/modules/vfs_notify_fam.c
@@ -68,7 +68,7 @@ static bool fam_connection_initialized = False;
 
 static struct fam_watch_context *fam_notify_list;
 static void fam_handler(struct tevent_context *event_ctx,
-                       struct fd_event *fd_event,
+                       struct tevent_fd *fd_event,
                        uint16 flags,
                        void *private_data);
 
@@ -147,7 +147,7 @@ static void fam_reopen(FAMConnection *fam_conn,
 }
 
 static void fam_handler(struct tevent_context *event_ctx,
-                       struct fd_event *fd_event,
+                       struct tevent_fd *fd_event,
                        uint16 flags,
                        void *private_data)
 {

diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c
index 4aae77d613d6c8202aa291df086db7173a417271..175298685ac82373915d8b70cca8691eca702965 100644 (file)
--- a/source3/modules/vfs_preopen.c
+++ b/source3/modules/vfs_preopen.c
@@ -26,7 +26,7 @@ struct preopen_state;
 
 struct preopen_helper {
        struct preopen_state *state;
-       struct fd_event *fde;
+       struct tevent_fd *fde;
        pid_t pid;
        int fd;
        bool busy;
@@ -107,7 +107,7 @@ static void preopen_queue_run(struct preopen_state *state)
 }
 
 static void preopen_helper_readable(struct tevent_context *ev,
-                                   struct fd_event *fde, uint16_t flags,
+                                   struct tevent_fd *fde, uint16_t flags,
                                    void *priv)
 {
        struct preopen_helper *helper = (struct preopen_helper *)priv;