diff options
| author | Ralph Boehme <slow@samba.org> | 2018-12-23 09:34:20 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2019-01-11 23:11:13 +0100 |
| commit | 29fc7c7db788b1bb200e3a4019d42c045ad0d582 (patch) | |
| tree | 25488d6e9e104cdeb77472de14e12638795434cb /source3/smbd | |
| parent | 8074922c267677434e6174a2e74b2b7959762014 (diff) | |
| download | samba-29fc7c7db788b1bb200e3a4019d42c045ad0d582.tar.gz | |
smbd: rename sconn->raw_thread_pool to sconn->pool
This is basically a revert of commit
2be7518ae5a3c046f5fca04ecc83f9f7044eac74.
See the discussion in
https://lists.samba.org/archive/samba-technical/2018-December/131731.html
for the reasoning behind this revert.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/globals.h | 2 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 | ||||
| -rw-r--r-- | source3/smbd/smb2_query_directory.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h index b6dc27d47be..5695663cc66 100644 --- a/source3/smbd/globals.h +++ b/source3/smbd/globals.h @@ -943,7 +943,7 @@ struct smbd_server_connection { } locks; } smb2; - struct pthreadpool_tevent *raw_thread_pool; + struct pthreadpool_tevent *pool; struct smbXsrv_client *client; }; diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 8e1fceab0aa..0a4106257f5 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -3950,7 +3950,7 @@ void smbd_process(struct tevent_context *ev_ctx, sconn->msg_ctx = msg_ctx; ret = pthreadpool_tevent_init(sconn, lp_aio_max_threads(), - &sconn->raw_thread_pool); + &sconn->pool); if (ret != 0) { exit_server("pthreadpool_tevent_init() failed."); } diff --git a/source3/smbd/smb2_query_directory.c b/source3/smbd/smb2_query_directory.c index 1a3447c3a82..ab6c3dc788e 100644 --- a/source3/smbd/smb2_query_directory.c +++ b/source3/smbd/smb2_query_directory.c @@ -515,7 +515,7 @@ static struct tevent_req *smbd_smb2_query_directory_send(TALLOC_CTX *mem_ctx, if (state->async_dosmode) { size_t max_threads; - max_threads = pthreadpool_tevent_max_threads(conn->sconn->raw_thread_pool); + max_threads = pthreadpool_tevent_max_threads(conn->sconn->pool); state->max_async_dosmode_active = lp_smbd_max_async_dosmode( SNUM(conn)); @@ -660,7 +660,7 @@ static bool smb2_query_directory_next_entry(struct tevent_req *req) state->async_dosmode_active++; outstanding_aio = pthreadpool_tevent_queued_jobs( - state->fsp->conn->sconn->raw_thread_pool); + state->fsp->conn->sconn->pool); if (outstanding_aio > state->max_async_dosmode_active) { stop = true; |