diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-02-18 10:24:12 +0100 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-02-19 23:47:58 +0100 |
| commit | a0d96b53e7730c5e0b4986342fa73ab81b7869ef (patch) | |
| tree | be959e72a15bd4bed5cc61826a179c791df30f92 | |
| parent | 59b8f803d74c45e2477c533b5b380afb011f8ebe (diff) | |
| download | samba-a0d96b53e7730c5e0b4986342fa73ab81b7869ef.tar.gz samba-a0d96b53e7730c5e0b4986342fa73ab81b7869ef.tar.bz2 samba-a0d96b53e7730c5e0b4986342fa73ab81b7869ef.zip | |
s3:smbd: s/struct fd_event/struct tevent_fd
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | source3/smbd/globals.h | 4 | ||||
| -rw-r--r-- | source3/smbd/notify_inotify.c | 2 | ||||
| -rw-r--r-- | source3/smbd/oplock_irix.c | 4 | ||||
| -rw-r--r-- | source3/smbd/process.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 4b0165b673..3461bc50df 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 bfa41c9940..c1543965a7 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 ea439452c0..635f8320bf 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 0410f16fdc..2081a347ba 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) { |