Skip to content

V
varnish-cache
Commit e8941f63 authored by Poul-Henning Kamp's avatar Poul-Henning Kamp
Browse files
Options

We don't need a vsl copy any more.

parent 54b7af96
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
bin/varnishd/cache/cache_backend.c
View file @ e8941f63
...@@ -356,7 +356,6 @@ vbe_CloseFd(struct vbc **vbp, const struct acct_bereq *acct_bereq) ...@@ -356,7 +356,6 @@ vbe_CloseFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
bp = vc->backend; bp = vc->backend;
vc->vsl = NULL;
VTCP_close(&vc->fd); VTCP_close(&vc->fd);
VBE_DropRefConn(bp, acct_bereq); VBE_DropRefConn(bp, acct_bereq);
vc->backend = NULL; vc->backend = NULL;
...@@ -380,8 +379,6 @@ vbe_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct_bereq) ...@@ -380,8 +379,6 @@ vbe_RecycleFd(struct vbc **vbp, const struct acct_bereq *acct_bereq)
bp = vc->backend; bp = vc->backend;
vc->vsl = NULL;
Lck_Lock(&bp->mtx); Lck_Lock(&bp->mtx);
VSC_C_main->backend_recycle++; VSC_C_main->backend_recycle++;
VTAILQ_INSERT_HEAD(&bp->connlist, vc, list); VTAILQ_INSERT_HEAD(&bp->connlist, vc, list);
...@@ -409,9 +406,7 @@ vbe_dir_getfd(const struct director *d, struct busyobj *bo) ...@@ -409,9 +406,7 @@ vbe_dir_getfd(const struct director *d, struct busyobj *bo)
FIND_TMO(between_bytes_timeout, FIND_TMO(between_bytes_timeout,
vc->between_bytes_timeout, bo, vs->vrt); vc->between_bytes_timeout, bo, vs->vrt);
} }
if (vc != NULL) if (vc == NULL)
vc->vsl = bo->vsl;
else
VSLb(bo->vsl, SLT_FetchError, "no backend connection"); VSLb(bo->vsl, SLT_FetchError, "no backend connection");
return (vc); return (vc);
} }
......
bin/varnishd/cache/cache_backend.h
View file @ e8941f63
...@@ -89,7 +89,6 @@ struct vbc { ...@@ -89,7 +89,6 @@ struct vbc {
VTAILQ_ENTRY(vbc) list; VTAILQ_ENTRY(vbc) list;
struct backend *backend; struct backend *backend;
struct vbe_dir *vdis; struct vbe_dir *vdis;
struct vsl_log *vsl;
int fd; int fd;
struct suckaddr *addr; struct suckaddr *addr;
......
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