[master] c6b613b Remove a couple of commented out asserts which will not come back.

Poul-Henning Kamp phk at FreeBSD.org
Thu Nov 19 09:54:39 CET 2015


commit c6b613b6dac2eb630eeccfa918a330d565e4951e
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Nov 18 12:11:57 2015 +0000

    Remove a couple of commented out asserts which will not come back.

diff --git a/bin/varnishd/cache/cache_expire.c b/bin/varnishd/cache/cache_expire.c
index e74b328..65236b7 100644
--- a/bin/varnishd/cache/cache_expire.c
+++ b/bin/varnishd/cache/cache_expire.c
@@ -435,8 +435,6 @@ exp_inbox(struct exp_priv *ep, struct objcore *oc, double now)
 	VSLb(&ep->vsl, SLT_ExpKill, "EXP_Inbox p=%p e=%.9f f=0x%x", oc,
 	    oc->timer_when, oc->flags);
 
-	// AZ(oc->flags & OC_F_BUSY);
-
 	lru = ObjGetLRU(oc);
 	CHECK_OBJ_NOTNULL(lru, LRU_MAGIC);
 
@@ -519,7 +517,7 @@ exp_expire(struct exp_priv *ep, double now)
 	lru = ObjGetLRU(oc);
 	CHECK_OBJ_NOTNULL(lru, LRU_MAGIC);
 	Lck_Lock(&lru->mtx);
-	// AZ(oc->flags & OC_F_BUSY);
+
 	oc->exp_flags |= OC_EF_DYING;
 	if (oc->exp_flags & OC_EF_OFFLRU)
 		oc = NULL;



More information about the varnish-commit mailing list