Skip to content

V
varnish-cache
Unverified Commit e0b164f9 authored by Nils Goroll's avatar Nils Goroll
Browse files
Options

Polish

parent c096659d
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 6 deletions
bin/varnishd/cache/cache_vrt_vcl.c
View file @ e0b164f9
...@@ -154,6 +154,17 @@ vcldir_free(struct vcldir *vdir) ...@@ -154,6 +154,17 @@ vcldir_free(struct vcldir *vdir)
FREE_OBJ(vdir); FREE_OBJ(vdir);
} }
static VCL_BACKEND
vcldir_surplus(struct vcldir *vdir)
{
CHECK_OBJ_NOTNULL(vdir, VCLDIR_MAGIC);
assert(vdir->refcnt == 1);
vdir->refcnt = 0;
vcldir_free(vdir);
return (NULL);
}
VCL_BACKEND VCL_BACKEND
VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv, VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv,
const char *fmt, ...) const char *fmt, ...)
...@@ -217,12 +228,9 @@ VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv, ...@@ -217,12 +228,9 @@ VRT_AddDirector(VRT_CTX, const struct vdi_methods *m, void *priv,
VDI_Event(vdir->dir, VCL_EVENT_WARM); VDI_Event(vdir->dir, VCL_EVENT_WARM);
Lck_Unlock(&vcl_mtx); Lck_Unlock(&vcl_mtx);
if (temp == VCL_TEMP_COOLING) { if (temp == VCL_TEMP_COOLING)
assert(vdir->refcnt == 1); return (vcldir_surplus(vdir));
vdir->refcnt = 0;
vcldir_free(vdir);
return (NULL);
}
if (!temp->is_warm && temp != VCL_TEMP_INIT) if (!temp->is_warm && temp != VCL_TEMP_INIT)
WRONG("Dynamic Backends can only be added to warm VCLs"); WRONG("Dynamic Backends can only be added to warm VCLs");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment