s3:smbd: s/struct timed_event/struct tevent_timer

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index d60cb5e73bc815b84564faecf629dbdae0c76e3b..6d9be77bfd978d467a5df2ebb2a571dd21b6e04e 100644 (file)
--- 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 1bef73b69725e9949b5241731616ff9c4a40038b..4bd7a5732fcc6551b41475cafac05f23924e34c1 100644 (file)
--- 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 409924d384c91484bf5b05f434a84652c6d849e2..96eb24b0732a673e814acc99aef1f9aa256d6df6 100644 (file)
--- 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 90e9ab4dd7d3a9a7e27eb244967b07728e542700..4b0165b673421530ea257b3e746ab337ec18345c 100644 (file)
--- 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 6245817fd3f1f2c04c0dbe10b1c7cb8b23fd949b..f44711323fae2c111d3fdb7d2ae3df60a4be55fa 100644 (file)
--- 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 73f68c02ec6f771921cc9e492da444173be900bb..0d98a2f2f8f231aa234002588b6180538ee44cda 100644 (file)
--- 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 6588f30e95c1234607ee1638b98ebadfdb839ca8..bd22dd3b59944ea3254ec05fb97a1f0bf1635a2c 100644 (file)
--- 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 b8c876750d55ae83e2d9b441baa2a907e43e72f7..2b8e3f72f2cc5ffbbb9b9caff1f420b27c23a8a4 100644 (file)
--- 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 3fe901d2a2be164815ff458f97dc4046d62309dc..c239ccb1432b2c07841feeefdf5bcd01888d93ca 100644 (file)
--- 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)
 {