[master] 111a42f Pass the vsmw_cluster arg through

[Poul-Henning Kamp]

commit 111a42f745cf188ec13a0be10b6e15b9d1fd3f15
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Jan 9 09:00:34 2018 +0000

    Pass the vsmw_cluster arg through

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 44c1d2b..0dcfa48 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -433,7 +433,6 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
 	int retval;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	(void)vc;
 	CHECK_OBJ_NOTNULL(vrt, VRT_BACKEND_MAGIC);
 	assert(vrt->ipv4_suckaddr != NULL || vrt->ipv6_suckaddr != NULL);
 
@@ -486,7 +485,7 @@ VRT_new_backend_clustered(VRT_CTX, struct vsmw_cluster *vc,
 		VBP_Insert(be, vbp, be->tcp_pool);
 	}
 
-	be->vsc = VSC_vbe_New(NULL, &be->vsc_seg,
+	be->vsc = VSC_vbe_New(vc, &be->vsc_seg,
 	    "%s.%s", VCL_Name(ctx->vcl), vrt->vcl_name);
 	AN(be->vsc);
 
diff --git a/bin/varnishd/common/common_vsc.c b/bin/varnishd/common/common_vsc.c
index ae2f0a1..103b967 100644
--- a/bin/varnishd/common/common_vsc.c
+++ b/bin/varnishd/common/common_vsc.c
@@ -75,7 +75,8 @@ vsc_callback_f *vsc_lock;
 vsc_callback_f *vsc_unlock;
 
 static struct vsc_seg *
-vrt_vsc_mksegv(const char *class, size_t payload, const char *fmt, va_list va)
+vrt_vsc_mksegv(struct vsmw_cluster *vc, const char *class,
+    size_t payload, const char *fmt, va_list va)
 {
 	struct vsc_seg *vsg;
 	size_t co;
@@ -83,7 +84,7 @@ vrt_vsc_mksegv(const char *class, size_t payload, const char *fmt, va_list va)
 	co = PRNDUP(sizeof(struct vsc_head));
 	ALLOC_OBJ(vsg, VSC_SEG_MAGIC);
 	AN(vsg);
-	vsg->seg = VSMW_Allocv(heritage.proc_vsmw, NULL, class,
+	vsg->seg = VSMW_Allocv(heritage.proc_vsmw, vc, class,
 	    co + PRNDUP(payload), fmt, va);
 	AN(vsg->seg);
 	vsg->vsm = heritage.proc_vsmw;
@@ -100,7 +101,7 @@ vrt_vsc_mksegf(const char *class, size_t payload, const char *fmt, ...)
 	struct vsc_seg *vsg;
 
 	va_start(ap, fmt);
-	vsg = vrt_vsc_mksegv(class, payload, fmt, ap);
+	vsg = vrt_vsc_mksegv(NULL, class, payload, fmt, ap);
 	va_end(ap);
 	return (vsg);
 }
@@ -130,7 +131,6 @@ VRT_VSC_Alloc(struct vsmw_cluster *vc, struct vsc_seg **sg,
 	char buf[1024];
 	uintptr_t jjp;
 
-	AZ(vc);
 	if (vsc_lock != NULL)
 		vsc_lock();
 
@@ -164,7 +164,7 @@ VRT_VSC_Alloc(struct vsmw_cluster *vc, struct vsc_seg **sg,
 
 	AN(heritage.proc_vsmw);
 
-	vsg = vrt_vsc_mksegv(VSC_CLASS, sd, buf, va);
+	vsg = vrt_vsc_mksegv(vc, VSC_CLASS, sd, buf, va);
 	AN(vsg);
 	vsg->nm = nm;
 	vsg->doc = dvsg;