From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 18 Feb 2013 09:24:12 +0000 (+0100)
Subject: s3:smbd: s/struct fd_event/struct tevent_fd
X-Git-Tag: tevent-0.9.18~151
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0d96b53e7730c5e0b4986342fa73ab81b7869ef;p=thirdparty%2Fsamba.git

s3:smbd: 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/smbd/globals.h b/source3/smbd/globals.h
index 4b0165b6734..3461bc50df9 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -659,7 +659,7 @@ struct smbd_server_connection {
 	} oplocks;
 
 	struct {
-		struct fd_event *fde;
+		struct tevent_fd *fde;
 
 		struct {
 			/*
@@ -676,7 +676,7 @@ struct smbd_server_connection {
 			/*
 			 * fde for the trusted_fd
 			 */
-			struct fd_event *trusted_fde;
+			struct tevent_fd *trusted_fde;
 
 			/*
 			 * Reference count for the fcntl lock to
diff --git a/source3/smbd/notify_inotify.c b/source3/smbd/notify_inotify.c
index bfa41c9940b..c1543965a7d 100644
--- 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 tevent_context *ev, struct fd_event *fde,
+static void inotify_handler(struct tevent_context *ev, struct tevent_fd *fde,
 			    uint16_t flags, void *private_data)
 {
 	struct inotify_private *in = talloc_get_type(private_data,
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index ea439452c00..635f8320bf6 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -30,7 +30,7 @@ struct irix_oplocks_context {
 	struct smbd_server_connection *sconn;
 	int write_fd;
 	int read_fd;
-	struct fd_event *read_fde;
+	struct tevent_fd *read_fde;
 	bool pending;
 };
 
@@ -277,7 +277,7 @@ static void irix_release_kernel_oplock(struct kernel_oplocks *_ctx,
 }
 
 static void irix_oplocks_read_fde_handler(struct tevent_context *ev,
-					  struct fd_event *fde,
+					  struct tevent_fd *fde,
 					  uint16_t flags,
 					  void *private_data)
 {
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 0410f16fdc7..2081a347ba8 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -2429,7 +2429,7 @@ process:
 }
 
 static void smbd_server_connection_handler(struct tevent_context *ev,
-					   struct fd_event *fde,
+					   struct tevent_fd *fde,
 					   uint16_t flags,
 					   void *private_data)
 {
@@ -2447,7 +2447,7 @@ static void smbd_server_connection_handler(struct tevent_context *ev,
 }
 
 static void smbd_server_echo_handler(struct tevent_context *ev,
-				     struct fd_event *fde,
+				     struct tevent_fd *fde,
 				     uint16_t flags,
 				     void *private_data)
 {