diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-06-24 16:26:23 +1000 |
| commit | 6da26870e0ae5acd6ff49a30ec2f6886b44d095e (patch) | |
| tree | 850c71039563c16a5d563c47e7ba2ab645baf198 /source3/modules/vfs_aio_fork.c | |
| parent | 6925a799d04c6fa59dd2ddef1f5510f9bb7d17d1 (diff) | |
| parent | 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 (diff) | |
| download | samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.gz samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.tar.bz2 samba-6da26870e0ae5acd6ff49a30ec2f6886b44d095e.zip | |
Merge 2610c05b5b95cc7036b3d6dfb894c6cfbdb68483 as Samba-4.0alpha16
Diffstat (limited to 'source3/modules/vfs_aio_fork.c')
| -rw-r--r-- | source3/modules/vfs_aio_fork.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 41b5a89dd2..961efd85de 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -260,7 +260,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, + list->cleanup_event = event_add_timed(server_event_context(), list, timeval_add(&now, 30, 0), aio_child_cleanup, list); @@ -277,7 +277,7 @@ static struct aio_child_list *init_aio_children(struct vfs_handle_struct *handle } if (data == NULL) { - data = TALLOC_ZERO_P(NULL, struct aio_child_list); + data = talloc_zero(NULL, struct aio_child_list); if (data == NULL) { return NULL; } @@ -290,7 +290,7 @@ 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, + data->cleanup_event = event_add_timed(server_event_context(), data, timeval_current_ofs(30, 0), aio_child_cleanup, data); if (data->cleanup_event == NULL) { @@ -481,7 +481,7 @@ static NTSTATUS create_aio_child(struct smbd_server_connection *sconn, fdpair[0] = fdpair[1] = -1; - result = TALLOC_ZERO_P(children, struct aio_child); + result = talloc_zero(children, struct aio_child); NT_STATUS_HAVE_NO_MEMORY(result); if (socketpair(AF_UNIX, SOCK_STREAM, 0, fdpair) == -1) { @@ -519,7 +519,7 @@ static NTSTATUS create_aio_child(struct smbd_server_connection *sconn, result->sockfd = fdpair[0]; close(fdpair[1]); - result->sock_event = event_add_fd(smbd_event_context(), result, + result->sock_event = event_add_fd(server_event_context(), result, result->sockfd, EVENT_FD_READ, handle_aio_completion, result); |