[master] e8941f6 We don't need a vsl copy any more.

Poul-Henning Kamp phk at FreeBSD.org
Mon Oct 6 10:03:43 CEST 2014


commit e8941f637a46a9fd750a401911e985cf31ba39ff
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Oct 6 08:03:15 2014 +0000

    We don't need a vsl copy any more.

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index 4e4625c..b6d75a7 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -356,7 +356,6 @@ vbe_CloseFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
 
 	bp = vc->backend;
 
-	vc->vsl = NULL;
 	VTCP_close(&vc->fd);
 	VBE_DropRefConn(bp, acct_bereq);
 	vc->backend = NULL;
@@ -380,8 +379,6 @@ vbe_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
 
 	bp = vc->backend;
 
-	vc->vsl = NULL;
-
 	Lck_Lock(&bp->mtx);
 	VSC_C_main->backend_recycle++;
 	VTAILQ_INSERT_HEAD(&bp->connlist, vc, list);
@@ -409,9 +406,7 @@ vbe_dir_getfd(const struct director *d, struct busyobj *bo)
 		FIND_TMO(between_bytes_timeout,
 		    vc->between_bytes_timeout, bo, vs->vrt);
 	}
-	if (vc != NULL)
-		vc->vsl = bo->vsl;
-	else
+	if (vc == NULL)
 		VSLb(bo->vsl, SLT_FetchError, "no backend connection");
 	return (vc);
 }
diff --git a/bin/varnishd/cache/cache_backend.h b/bin/varnishd/cache/cache_backend.h
index 72a4cdf..bf3e789 100644
--- a/bin/varnishd/cache/cache_backend.h
+++ b/bin/varnishd/cache/cache_backend.h
@@ -89,7 +89,6 @@ struct vbc {
 	VTAILQ_ENTRY(vbc)	list;
 	struct backend		*backend;
 	struct vbe_dir	*vdis;
-	struct vsl_log		*vsl;
 	int			fd;
 
 	struct suckaddr		*addr;



More information about the varnish-commit mailing list