From e5dd03d1991f125fa3cfddac9a41d2f9e6391c42 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 25 May 2011 18:51:56 +1000 Subject: s3-globals Remove smbd_event_context() (use server_event_context()) This has been a wrapper around server_event_context() for some time now, and removing this from dummmysmbd.c assists with library dependencies. Andrew Bartlett --- source3/modules/vfs_aio_fork.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/modules/vfs_aio_fork.c') diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index 41b5a89dd2..fdf32f6c20 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); @@ -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) { @@ -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); -- cgit From ad0a07c531fadd1639c5298951cfaf5cfe0cb10e Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 7 Jun 2011 11:44:43 +1000 Subject: s3-talloc Change TALLOC_ZERO_P() to talloc_zero() Using the standard macro makes it easier to move code into common, as TALLOC_ZERO_P isn't standard talloc. --- source3/modules/vfs_aio_fork.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/modules/vfs_aio_fork.c') diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c index fdf32f6c20..961efd85de 100644 --- a/source3/modules/vfs_aio_fork.c +++ b/source3/modules/vfs_aio_fork.c @@ -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; } @@ -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) { -- cgit