[PATCH] Remove lingering VSL flush calls from when we used FD as log ID.

Martin Blix Grydeland martin at varnish-software.com
Wed Aug 27 17:09:12 CEST 2014


---
 bin/varnishd/cache/cache_backend.c | 5 -----
 bin/varnishd/cache/cache_dir.c     | 8 --------
 2 files changed, 13 deletions(-)

diff --git a/bin/varnishd/cache/cache_backend.c b/bin/varnishd/cache/cache_backend.c
index ab638e2..d0358bf 100644
--- a/bin/varnishd/cache/cache_backend.c
+++ b/bin/varnishd/cache/cache_backend.c
@@ -325,11 +325,6 @@ vbe_GetVbe(struct busyobj *bo, struct vdi_simple *vs)
 		}
 
 		VSC_C_main->backend_toolate++;
-
-		/* Checkpoint log to flush all info related to this connection
-		   before the OS reuses the FD */
-		VSL_Flush(bo->vsl, 0);
-
 		VTCP_close(&vc->fd);
 		VBE_DropRefConn(bp, NULL);
 		vc->backend = NULL;
diff --git a/bin/varnishd/cache/cache_dir.c b/bin/varnishd/cache/cache_dir.c
index 557aa01..f90ee96 100644
--- a/bin/varnishd/cache/cache_dir.c
+++ b/bin/varnishd/cache/cache_dir.c
@@ -57,13 +57,7 @@ VDI_CloseFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
 
 	VSLb(vc->vsl, SLT_BackendClose, "%d %s", vc->fd, bp->display_name);
 
-	/*
-	 * Checkpoint log to flush all info related to this connection
-	 * before the OS reuses the FD
-	 */
-	VSL_Flush(vc->vsl, 0);
 	vc->vsl = NULL;
-
 	VTCP_close(&vc->fd);
 	VBE_DropRefConn(bp, acct_bereq);
 	vc->backend = NULL;
@@ -90,8 +84,6 @@ VDI_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
 
 	VSLb(vc->vsl, SLT_BackendReuse, "%d %s", vc->fd, bp->display_name);
 
-	/* XXX: revisit this hack */
-	VSL_Flush(vc->vsl, 0);
 	vc->vsl = NULL;
 
 	Lck_Lock(&bp->mtx);
-- 
2.1.0.rc1




More information about the varnish-dev mailing list