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 4b0165b673421530ea257b3e746ab337ec18345c..3461bc50df9e669822a15750b31303d8b7af732a 100644 (file)
--- 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 bfa41c9940bdf7371d81ebd1603873f92b27974c..c1543965a7d19da2446bcbdc236d2d873b34fc8a 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 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 ea439452c007762a77ae9c306e015011e804a597..635f8320bf6ae31120c6e0168966947b37561d4b 100644 (file)
--- 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 0410f16fdc73ce5f83eeab1d365af33c8c04b763..2081a347ba829d9aabb9bdb3d20f000a67a29208 100644 (file)
--- 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)
 {