[4.1] 3c8b8e1 Remove a couple of commented out asserts which will not come back.
Lasse Karstensen
lkarsten at varnish-software.com
Thu Jan 14 15:15:05 CET 2016
commit 3c8b8e1de54e2bb960308ebf657d991941d99990
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