[master] a5b3340 Use the direct stevedore pointer and drop the priv2 hack

[Poul-Henning Kamp]

commit a5b3340de717acd09598fcddbd965c65ba2539a6
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Nov 11 10:18:29 2014 +0000

    Use the direct stevedore pointer and drop the priv2 hack

diff --git a/bin/varnishd/storage/stevedore.c b/bin/varnishd/storage/stevedore.c
index 6a9fbb6..6762c34 100644
--- a/bin/varnishd/storage/stevedore.c
+++ b/bin/varnishd/storage/stevedore.c
@@ -82,9 +82,10 @@ default_oc_freeobj(struct worker *wrk, struct objcore *oc)
 static struct lru * __match_proto__(getlru_f)
 default_oc_getlru(const struct objcore *oc)
 {
-	struct stevedore *stv;
+	const struct stevedore *stv;
 
-	CAST_OBJ_NOTNULL(stv, (void *)oc->stobj->priv2, STEVEDORE_MAGIC);
+	stv = oc->stobj->stevedore;
+	CHECK_OBJ_NOTNULL(stv, STEVEDORE_MAGIC);
 	return (stv->lru);
 }
 
@@ -208,7 +209,6 @@ STV_MkObject(const struct stevedore *stv, struct objcore *oc, void *ptr)
 	oc->stobj->stevedore = stv;
 	AN(stv->methods);
 	oc->stobj->priv = o;
-	oc->stobj->priv2 = (uintptr_t)stv;
 	return (o);
 }