diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-25 18:51:56 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 00:32:07 +0200 |
| commit | e5dd03d1991f125fa3cfddac9a41d2f9e6391c42 (patch) | |
| tree | 0b1c0bdf4759f2ad1331febe2612ca739eba8d30 /source3/modules | |
| parent | 81905585c093b6d641a10f6c338949bcbaa724c0 (diff) | |
| download | samba-e5dd03d1991f125fa3cfddac9a41d2f9e6391c42.tar.gz samba-e5dd03d1991f125fa3cfddac9a41d2f9e6391c42.tar.bz2 samba-e5dd03d1991f125fa3cfddac9a41d2f9e6391c42.zip | |
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
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/onefs_cbrl.c | 2 | ||||
| -rw-r--r-- | source3/modules/vfs_aio_fork.c | 6 | ||||
| -rw-r--r-- | source3/modules/vfs_preopen.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/onefs_cbrl.c b/source3/modules/onefs_cbrl.c index 5c69bec566..2f20d04ddb 100644 --- a/source3/modules/onefs_cbrl.c +++ b/source3/modules/onefs_cbrl.c @@ -251,7 +251,7 @@ static void onefs_init_cbrl(void) DEBUG(10, ("cbrl_event_fd = %d\n", cbrl_event_fd)); /* Register the CBRL event_fd with samba's event system */ - cbrl_fde = event_add_fd(smbd_event_context(), + cbrl_fde = event_add_fd(server_event_context(), NULL, cbrl_event_fd, EVENT_FD_READ, 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); diff --git a/source3/modules/vfs_preopen.c b/source3/modules/vfs_preopen.c index e4b3a0c435..e0d1fd7ec0 100644 --- a/source3/modules/vfs_preopen.c +++ b/source3/modules/vfs_preopen.c @@ -237,7 +237,7 @@ static NTSTATUS preopen_init_helper(struct preopen_helper *h) } close(fdpair[1]); h->fd = fdpair[0]; - h->fde = event_add_fd(smbd_event_context(), h->state, h->fd, + h->fde = event_add_fd(server_event_context(), h->state, h->fd, EVENT_FD_READ, preopen_helper_readable, h); if (h->fde == NULL) { close(h->fd); |