[6.0] 41c1eeb2a Don't reset the workspace on pointless VDP_Push(), things might still have been happening on the workspace (See: VRG)

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Wed Feb 6 10:11:09 UTC 2019


commit 41c1eeb2a06283edf44487a79b887c5b1abc16fb
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Nov 19 21:26:48 2018 +0000

    Don't reset the workspace on pointless VDP_Push(), things might
    still have been happening on the workspace (See: VRG)

diff --git a/bin/varnishd/cache/cache_deliver_proc.c b/bin/varnishd/cache/cache_deliver_proc.c
index 99b2c8318..fa3392f5f 100644
--- a/bin/varnishd/cache/cache_deliver_proc.c
+++ b/bin/varnishd/cache/cache_deliver_proc.c
@@ -78,7 +78,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
 {
 	struct vdp_entry *vdpe;
 	struct vdp_ctx *vdc;
-	uintptr_t sn;
 
 	CHECK_OBJ_NOTNULL(req, REQ_MAGIC);
 	vdc = req->vdc;
@@ -92,7 +91,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
 	if (DO_DEBUG(DBG_PROCESSORS))
 		VSLb(req->vsl, SLT_Debug, "VDP_push(%s)", vdp->name);
 
-	sn = WS_Snapshot(req->ws);
 	vdpe = WS_Alloc(req->ws, sizeof *vdpe);
 	if (vdpe == NULL) {
 		AZ(vdc->retval);
@@ -111,7 +109,6 @@ VDP_Push(struct req *req, const struct vdp *vdp, void *priv)
 	if (vdc->retval > 0) {
 		VTAILQ_REMOVE(&vdc->vdp, vdpe, list);
 		vdc->nxt = VTAILQ_FIRST(&vdc->vdp);
-		WS_Reset(req->ws, sn);
 		vdc->retval = 0;
 	}
 	return (vdc->retval);


More information about the varnish-commit mailing list