[master] 9905baa5a Minor polish.

[Poul-Henning Kamp]

commit 9905baa5a67c1ab29ae3ceca12c89ee412197573
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 19 10:21:04 2021 +0000

    Minor polish.

diff --git a/bin/varnishd/cache/cache_backend_probe.c b/bin/varnishd/cache/cache_backend_probe.c
index e4181bcce..d1750ac63 100644
--- a/bin/varnishd/cache/cache_backend_probe.c
+++ b/bin/varnishd/cache/cache_backend_probe.c
@@ -181,9 +181,9 @@ VBP_Update_Backend(struct vbp_target *vt)
 	chg = (i != vt->backend->sick);
 	vt->backend->sick = i;
 
-	AN(dir->vcl_name);
+	AN(vt->backend->vcl_name);
 	VSL(SLT_Backend_health, 0, "%s %s %s %s %u %u %u %.6f %.6f \"%s\"",
-	    dir->vcl_name, chg ? "Went" : "Still",
+	    vt->backend->vcl_name, chg ? "Went" : "Still",
 	    i ? "sick" : "healthy", bits,
 	    vt->good, vt->threshold, vt->window,
 	    vt->last, vt->avg, vt->resp_buf);
diff --git a/bin/varnishd/cache/cache_director.c b/bin/varnishd/cache/cache_director.c
index c6fd40d96..173ad6604 100644
--- a/bin/varnishd/cache/cache_director.c
+++ b/bin/varnishd/cache/cache_director.c
@@ -257,15 +257,11 @@ VRT_Healthy(VRT_CTX, VCL_BACKEND d, VCL_TIME *changed)
 VCL_VOID
 VRT_SetChanged(VCL_BACKEND d, VCL_TIME changed)
 {
-	if (d == NULL)
-		return;
 
-	CHECK_OBJ_NOTNULL(d, DIRECTOR_MAGIC);
-
-	if (changed <= d->vdir->health_changed)
-		return;
+	CHECK_OBJ_ORNULL(d, DIRECTOR_MAGIC);
 
-	d->vdir->health_changed = changed;
+	if (d != NULL && changed > d->vdir->health_changed)
+		d->vdir->health_changed = changed;
 }
 
 /* Send Event ----------------------------------------------------------