[6.0] 56cd85326 Make sure wrk arg is always present, we need it for stats now.

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Oct 31 13:08:31 UTC 2018


commit 56cd85326514fbeba4e7e3efaf4f4b7b8727593c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 15 19:07:24 2018 +0000

    Make sure wrk arg is always present, we need it for stats now.

diff --git a/bin/varnishd/cache/cache_busyobj.c b/bin/varnishd/cache/cache_busyobj.c
index 1f452d5e4..6eac91434 100644
--- a/bin/varnishd/cache/cache_busyobj.c
+++ b/bin/varnishd/cache/cache_busyobj.c
@@ -146,7 +146,7 @@ VBO_ReleaseBusyObj(struct worker *wrk, struct busyobj **pbo)
 {
 	struct busyobj *bo;
 
-	CHECK_OBJ_ORNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
 	TAKE_OBJ_NOTNULL(bo, pbo, BUSYOBJ_MAGIC);
 	CHECK_OBJ_ORNULL(bo->fetch_objcore, OBJCORE_MAGIC);
 
@@ -171,7 +171,6 @@ VBO_ReleaseBusyObj(struct worker *wrk, struct busyobj **pbo)
 		wrk->stats->ws_backend_overflow++;
 
 	if (bo->fetch_objcore != NULL) {
-		AN(wrk);
 		(void)HSH_DerefObjCore(wrk, &bo->fetch_objcore,
 		    HSH_RUSH_POLICY);
 	}


More information about the varnish-commit mailing list