[master] fc8e57f Eliminate a unused field in struct sess

Poul-Henning Kamp phk at FreeBSD.org
Thu Mar 19 13:06:09 CET 2015


commit fc8e57f6874fe4aa7d151dbe44412ce52e7af774
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Mar 19 10:44:45 2015 +0000

    Eliminate a unused field in struct sess

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 9453cbc..4ddf35a 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -659,7 +659,6 @@ struct sess {
 	enum sess_step		sess_step;
 	struct lock		mtx;
 	int			fd;
-	enum sess_close		reason;
 	uint32_t		vxid;
 
 	/* Cross references ------------------------------------------*/
diff --git a/bin/varnishd/cache/cache_session.c b/bin/varnishd/cache/cache_session.c
index 79c8287..d0f8fe7 100644
--- a/bin/varnishd/cache/cache_session.c
+++ b/bin/varnishd/cache/cache_session.c
@@ -365,7 +365,6 @@ SES_Close(struct sess *sp, enum sess_close reason)
 	int i;
 
 	assert(sp->fd >= 0);
-	sp->reason = reason;
 	i = close(sp->fd);
 	assert(i == 0 || errno != EBADF); /* XXX EINVAL seen */
 	sp->fd = -1;
@@ -397,7 +396,7 @@ SES_Delete(struct sess *sp, enum sess_close reason, double now)
 
 	assert(VTAILQ_EMPTY(&sp->privs->privs));
 	VSL(SLT_SessClose, sp->vxid, "%s %.3f",
-	    sess_close_2str(sp->reason, 0), now - sp->t_open);
+	    sess_close_2str(reason, 0), now - sp->t_open);
 	VSL(SLT_End, sp->vxid, "%s", "");
 
 	Lck_Delete(&sp->mtx);



More information about the varnish-commit mailing list