From ae1cb5ca04eb46d1112868bc80b459eb2a168920 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Feb 2013 10:18:29 +0100 Subject: [PATCH] s3:smbd: s/struct timed_event/struct tevent_timer Signed-off-by: Stefan Metzmacher Reviewed-by: Michael Adam --- source3/include/vfs.h | 4 ++-- source3/smbd/blocking.c | 2 +- source3/smbd/fileio.c | 2 +- source3/smbd/globals.h | 4 ++-- source3/smbd/oplock.c | 2 +- source3/smbd/process.c | 6 +++--- source3/smbd/proto.h | 4 ++-- source3/smbd/server.c | 4 ++-- source3/smbd/smb2_create.c | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/source3/include/vfs.h b/source3/include/vfs.h index d60cb5e73bc..6d9be77bfd9 100644 --- a/source3/include/vfs.h +++ b/source3/include/vfs.h @@ -213,14 +213,14 @@ typedef struct files_struct { uint32 share_access; /* NTCreateX share constants (FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE). */ bool update_write_time_triggered; - struct timed_event *update_write_time_event; + struct tevent_timer *update_write_time_event; bool update_write_time_on_close; struct timespec close_write_time; bool write_time_forced; int oplock_type; int sent_oplock_break; - struct timed_event *oplock_timeout; + struct tevent_timer *oplock_timeout; struct lock_struct last_lock_failure; int current_lock_count; /* Count the number of outstanding locks and pending locks. */ diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c index 1bef73b6972..4bd7a5732fc 100644 --- a/source3/smbd/blocking.c +++ b/source3/smbd/blocking.c @@ -36,7 +36,7 @@ static void received_unlock_msg(struct messaging_context *msg, DATA_BLOB *data); void brl_timeout_fn(struct tevent_context *event_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { diff --git a/source3/smbd/fileio.c b/source3/smbd/fileio.c index 409924d384c..96eb24b0732 100644 --- a/source3/smbd/fileio.c +++ b/source3/smbd/fileio.c @@ -165,7 +165,7 @@ static int wcp_file_size_change(files_struct *fsp) } void update_write_time_handler(struct tevent_context *ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index 90e9ab4dd7d..4b0165b6734 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -725,7 +725,7 @@ struct smbd_server_connection { struct blocking_lock_record *blocking_lock_cancelled_queue; /* The event that makes us process our blocking lock queue */ - struct timed_event *brl_timeout; + struct tevent_timer *brl_timeout; bool blocking_lock_unlock_state; bool blocking_lock_cancel_state; @@ -738,7 +738,7 @@ struct smbd_server_connection { bool negprot_2ff; struct { /* The event that makes us process our blocking lock queue */ - struct timed_event *brl_timeout; + struct tevent_timer *brl_timeout; bool blocking_lock_unlock_state; } locks; struct smbd_smb2_request *requests; diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c index 6245817fd3f..f44711323fa 100644 --- a/source3/smbd/oplock.c +++ b/source3/smbd/oplock.c @@ -321,7 +321,7 @@ static files_struct *initial_break_processing( } static void oplock_timeout_handler(struct tevent_context *ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 73f68c02ec6..0d98a2f2f8f 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -46,7 +46,7 @@ struct pending_message_list { struct pending_message_list *next, *prev; struct timeval request_time; /* When was this first issued? */ struct smbd_server_connection *sconn; - struct timed_event *te; + struct tevent_timer *te; struct smb_perfcount_data pcd; uint32_t seqnum; bool encrypted; @@ -582,7 +582,7 @@ static void process_smb(struct smbd_server_connection *conn, struct smb_perfcount_data *deferred_pcd); static void smbd_deferred_open_timer(struct tevent_context *ev, - struct timed_event *te, + struct tevent_timer *te, struct timeval _tval, void *private_data) { @@ -735,7 +735,7 @@ bool schedule_deferred_open_message_smb(struct smbd_server_connection *sconn, (unsigned long long)msg_mid )); if (mid == msg_mid) { - struct timed_event *te; + struct tevent_timer *te; if (pml->processed) { /* A processed message should not be diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 6588f30e95c..bd22dd3b599 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -93,7 +93,7 @@ bool cancel_smb2_aio(struct smb_request *smbreq); /* The following definitions come from smbd/blocking.c */ void brl_timeout_fn(struct tevent_context *event_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data); struct timeval timeval_brl_min(const struct timeval *tv1, @@ -315,7 +315,7 @@ NTSTATUS can_set_delete_on_close(files_struct *fsp, uint32 dosmode); ssize_t read_file(files_struct *fsp,char *data,off_t pos,size_t n); void update_write_time_handler(struct tevent_context *ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data); void trigger_write_time_update(struct files_struct *fsp); diff --git a/source3/smbd/server.c b/source3/smbd/server.c index b8c876750d5..2b8e3f72f2c 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -62,7 +62,7 @@ struct smbd_parent_context { struct smbd_child_pid *children; size_t num_children; - struct timed_event *cleanup_te; + struct tevent_timer *cleanup_te; }; struct smbd_open_socket { @@ -395,7 +395,7 @@ static void add_child_pid(struct smbd_parent_context *parent, */ static void cleanup_timeout_fn(struct tevent_context *event_ctx, - struct timed_event *te, + struct tevent_timer *te, struct timeval now, void *private_data) { diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 3fe901d2a2b..c239ccb1432 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -378,7 +378,7 @@ struct smbd_smb2_create_state { struct smbd_smb2_request *smb2req; struct smb_request *smb1req; bool open_was_deferred; - struct timed_event *te; + struct tevent_timer *te; struct tevent_immediate *im; struct timeval request_time; struct file_id id; @@ -1344,7 +1344,7 @@ bool schedule_deferred_open_message_smb2( *********************************************************/ static void smb2_deferred_open_timer(struct tevent_context *ev, - struct timed_event *te, + struct tevent_timer *te, struct timeval _tval, void *private_data) { -- 2.11.4.GIT