[PATCH 1/3] Fix up some sess_workspace leftovers

[Rogier 'DocWilco' Mulhuijzen]

Found by: Joakim Berg <flashn at glck.net>
---
 bin/varnishd/cache/cache_wrk.c |    8 ++++----
 bin/varnishd/mgt/mgt_main.c    |    2 +-
 bin/varnishd/mgt/mgt_param.c   |    8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/varnishd/cache/cache_wrk.c b/bin/varnishd/cache/cache_wrk.c
index 6087991..2b6cc23 100644
--- a/bin/varnishd/cache/cache_wrk.c
+++ b/bin/varnishd/cache/cache_wrk.c
@@ -131,13 +131,13 @@ WRK_BgThread(pthread_t *thr, const char *name, bgthread_t *func, void *priv)
 /*--------------------------------------------------------------------*/
 
 static void *
-wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
-    unsigned siov)
+wrk_thread_real(void *priv, unsigned shm_workspace,
+    unsigned wthread_workspace, unsigned siov)
 {
 	struct worker *w, ww;
 	uint32_t wlog[shm_workspace / 4];
 	/* XXX: can we trust these to be properly aligned ? */
-	unsigned char ws[sess_workspace];
+	unsigned char ws[wthread_workspace];
 	struct iovec iov[siov];
 
 	THR_SetName("cache-worker");
@@ -152,7 +152,7 @@ wrk_thread_real(void *priv, unsigned shm_workspace, unsigned sess_workspace,
 	w->wrw.ciov = siov;
 	AZ(pthread_cond_init(&w->cond, NULL));
 
-	WS_Init(w->ws, "wrk", ws, sess_workspace);
+	WS_Init(w->ws, "wrk", ws, wthread_workspace);
 
 	VSL(SLT_WorkThread, 0, "%p start", w);
 
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index cc918c1..6405cdd 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -406,7 +406,7 @@ main(int argc, char * const *argv)
 		 * Adjust default parameters for 32 bit systems to conserve
 		 * VM space.
 		 */
-		MCF_ParamSet(cli, "sess_workspace", "16384");
+		MCF_ParamSet(cli, "workspace_client", "16384");
 		cli_check(cli);
 
 		MCF_ParamSet(cli, "thread_pool_workspace", "16384");
diff --git a/bin/varnishd/mgt/mgt_param.c b/bin/varnishd/mgt/mgt_param.c
index 8123bfc..e3dfd12 100644
--- a/bin/varnishd/mgt/mgt_param.c
+++ b/bin/varnishd/mgt/mgt_param.c
@@ -705,8 +705,8 @@ static const struct parspec input_parspec[] = {
 		"Maximum number of bytes of HTTP client request we will deal "
 		"with.  This is a limit on all bytes up to the double blank "
 		"line which ends the HTTP request.\n"
-		"The memory for the request is allocated from the session "
-		"workspace (param: sess_workspace) and this parameter limits "
+		"The memory for the request is allocated from the client "
+		"workspace (param: workspace_client) and this parameter limits "
 		"how much of that the request is allowed to take up.",
 		0,
 		"32k", "bytes" },
@@ -724,8 +724,8 @@ static const struct parspec input_parspec[] = {
 		"with.  This is a limit on all bytes up to the double blank "
 		"line which ends the HTTP request.\n"
 		"The memory for the request is allocated from the worker "
-		"workspace (param: sess_workspace) and this parameter limits "
-		"how much of that the request is allowed to take up.",
+		"workspace (param: thread_pool_workspace) and this parameter "
+		"limits how much of that the request is allowed to take up.",
 		0,
 		"32k", "bytes" },
 	{ "http_max_hdr", tweak_uint, &mgt_param.http_max_hdr, 32, 65535,
-- 
1.7.5.4