diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-01-05 18:01:04 +0100 |
| commit | 37e6849d451c4f49c6a0c96a78a5ef81baab83d4 (patch) | |
| tree | d1e443f66fa367340ef04d39349e50e7100b9b5f /source3/modules/vfs_aio_fork.c | |
| parent | de7dc2cec059305d28cc75a5347bfd88f3cb5c95 (diff) | |
| parent | 0581094023ba5e561184a2ea57f6e905161de978 (diff) | |
| download | samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.gz samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.tar.bz2 samba-37e6849d451c4f49c6a0c96a78a5ef81baab83d4.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/modules/vfs_aio_fork.c')
| -rw-r--r-- | source3/modules/vfs_aio_fork.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 7914e8f401..30b14f280f 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -216,7 +216,7 @@ static ssize_t write_fd(int fd, void *ptr, size_t nbytes, int sendfd) static void aio_child_cleanup(struct event_context *event_ctx, struct timed_event *te, - const struct timeval *now, + struct timeval now, void *private_data) { struct aio_child_list *list = talloc_get_type_abort( @@ -252,8 +252,7 @@ static void aio_child_cleanup(struct event_context *event_ctx, * Re-schedule the next cleanup round */ list->cleanup_event = event_add_timed(smbd_event_context(), list, - timeval_add(now, 30, 0), - "aio_child_cleanup", + timeval_add(&now, 30, 0), aio_child_cleanup, list); } @@ -284,7 +283,6 @@ static struct aio_child_list *init_aio_children(struct vfs_handle_struct *handle if (data->cleanup_event == NULL) { data->cleanup_event = event_add_timed(smbd_event_context(), data, timeval_current_ofs(30, 0), - "aio_child_cleanup", aio_child_cleanup, data); if (data->cleanup_event == NULL) { TALLOC_FREE(data); |