[master] 683c7773f Revert "assert magic of vrt_privs when finalizing"

Nils Goroll nils.goroll at uplex.de
Fri Nov 27 18:23:08 UTC 2020


commit 683c7773fec527a1544ded6113f308c3462b4fcf
Author: Nils Goroll <nils.goroll at uplex.de>
Date:   Fri Nov 27 19:21:25 2020 +0100

    Revert "assert magic of vrt_privs when finalizing"
    
    This change also exposed #3385
    
    See #3470 for a suggestion how to get out of this
    
    This reverts commit 5cbb3586649839b83438bd99f557cf30c9c78a66.

diff --git a/bin/varnishd/cache/cache_vrt_priv.c b/bin/varnishd/cache/cache_vrt_priv.c
index 3d2ec57ee..44692af56 100644
--- a/bin/varnishd/cache/cache_vrt_priv.c
+++ b/bin/varnishd/cache/cache_vrt_priv.c
@@ -225,9 +225,7 @@ VCL_TaskLeave(struct vrt_privs *privs)
 	 * a costly operation. Instead we safely walk the whole tree and clear
 	 * the head at the very end.
 	 */
-	VRBT_FOREACH_SAFE(vp, vrt_privs, privs, vp1) {
-		CHECK_OBJ(vp, VRT_PRIV_MAGIC);
+	VRBT_FOREACH_SAFE(vp, vrt_privs, privs, vp1)
 		VRT_priv_fini(vp->priv);
-	}
 	ZERO_OBJ(privs, sizeof *privs);
 }


More information about the varnish-commit mailing list