diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/aio.c | 28 | ||||
| -rw-r--r-- | source3/smbd/proto.h | 1 |
2 files changed, 8 insertions, 21 deletions
diff --git a/source3/smbd/aio.c b/source3/smbd/aio.c index 000206a985..e5347a45a4 100644 --- a/source3/smbd/aio.c +++ b/source3/smbd/aio.c @@ -71,7 +71,7 @@ static void smbd_aio_signal_handler(struct tevent_context *ev_ctx, } -static bool initialize_async_io_handler(void) +bool initialize_async_io_handler(void) { static bool tried_signal_setup = false; @@ -156,11 +156,6 @@ NTSTATUS schedule_aio_read_and_X(connection_struct *conn, size_t min_aio_read_size = lp_aio_read_size(SNUM(conn)); int ret; - /* Ensure aio is initialized. */ - if (!initialize_async_io_handler()) { - return NT_STATUS_RETRY; - } - if (fsp->base_fsp != NULL) { /* No AIO on streams yet */ DEBUG(10, ("AIO on streams not yet supported\n")); @@ -263,11 +258,6 @@ NTSTATUS schedule_aio_write_and_X(connection_struct *conn, size_t min_aio_write_size = lp_aio_write_size(SNUM(conn)); int ret; - /* Ensure aio is initialized. */ - if (!initialize_async_io_handler()) { - return NT_STATUS_RETRY; - } - if (fsp->base_fsp != NULL) { /* No AIO on streams yet */ DEBUG(10, ("AIO on streams not yet supported\n")); @@ -426,11 +416,6 @@ NTSTATUS schedule_smb2_aio_read(connection_struct *conn, size_t min_aio_read_size = lp_aio_read_size(SNUM(conn)); int ret; - /* Ensure aio is initialized. */ - if (!initialize_async_io_handler()) { - return NT_STATUS_RETRY; - } - if (fsp->base_fsp != NULL) { /* No AIO on streams yet */ DEBUG(10, ("AIO on streams not yet supported\n")); @@ -532,11 +517,6 @@ NTSTATUS schedule_aio_smb2_write(connection_struct *conn, size_t min_aio_write_size = lp_aio_write_size(SNUM(conn)); int ret; - /* Ensure aio is initialized. */ - if (!initialize_async_io_handler()) { - return NT_STATUS_RETRY; - } - if (fsp->base_fsp != NULL) { /* No AIO on streams yet */ DEBUG(10, ("AIO on streams not yet supported\n")); @@ -1058,6 +1038,12 @@ void cancel_aio_by_fsp(files_struct *fsp) } #else + +bool initialize_async_io_handler(void) +{ + return false; +} + NTSTATUS schedule_aio_read_and_X(connection_struct *conn, struct smb_request *smbreq, files_struct *fsp, off_t startpos, diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index ca267a0500..5ab5185087 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -64,6 +64,7 @@ void srv_set_signing(struct smbd_server_connection *conn, /* The following definitions come from smbd/aio.c */ +bool initialize_async_io_handler(void); NTSTATUS schedule_aio_read_and_X(connection_struct *conn, struct smb_request *req, files_struct *fsp, off_t startpos, |