From 9ececaae5c13216ce9e29eebb0fad0d7a0e2ab90 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 18 Feb 2013 10:24:12 +0100
Subject: [PATCH] s3:modules: s/struct fd_event/struct tevent_fd

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
---
 source3/modules/vfs_aio_linux.c   | 6 +++---
 source3/modules/vfs_aio_pthread.c | 6 +++---
 source3/modules/vfs_notify_fam.c  | 4 ++--
 source3/modules/vfs_preopen.c     | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source3/modules/vfs_aio_linux.c b/source3/modules/vfs_aio_linux.c
index a8bc6797035..618897527e2 100644
--- 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 aa10921a3de..5642a89e2dc 100644
--- 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 c456cadd26d..f10a4c9c943 100644
--- 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 4aae77d613d..175298685ac 100644
--- 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;
-- 
2.11.4.GIT