Make HSH_Ref() take an objcore instead of an object.

git-svn-id: http://www.varnish-cache.org/svn/trunk/varnish-cache@5540 d4fa192b-c00b-0410-8231-f00ffab90ce4

bin/varnishd/cache_expire.c

@@ -128,8 +128,8 @@ EXP_Insert(struct object *o)
 	CHECK_OBJ_NOTNULL(o->objcore, OBJCORE_MAGIC);
 	AN(ObjIsBusy(o));
 	assert(o->cacheable);
-	HSH_Ref(o);
 	oc = o->objcore;
+	HSH_Ref(oc);
 
 	assert(o->entered != 0 && !isnan(o->entered));
 	o->last_lru = o->entered;

bin/varnishd/cache_hash.c

@@ -607,17 +607,16 @@ HSH_Unbusy(const struct sess *sp)
 }
 
 void
-HSH_Ref(const struct object *o)
+HSH_Ref(struct objcore *oc)
 {
 	struct objhead *oh;
 
-	CHECK_OBJ_NOTNULL(o, OBJECT_MAGIC);
-	CHECK_OBJ_NOTNULL(o->objcore, OBJCORE_MAGIC);
-	oh = o->objcore->objhead;
+	CHECK_OBJ_NOTNULL(oc, OBJCORE_MAGIC);
+	oh = oc->objhead;
 	CHECK_OBJ_NOTNULL(oh, OBJHEAD_MAGIC);
 	Lck_Lock(&oh->mtx);
-	assert(o->objcore->refcnt > 0);
-	o->objcore->refcnt++;
+	assert(oc->refcnt > 0);
+	oc->refcnt++;
 	Lck_Unlock(&oh->mtx);
 }
 

bin/varnishd/hash_slinger.h

@@ -56,7 +56,7 @@ void HSH_Cleanup(struct worker *w);
 void HSH_Freestore(struct object *o);
 struct objcore *HSH_Lookup(struct sess *sp, struct objhead **poh);
 void HSH_Unbusy(const struct sess *sp);
-void HSH_Ref(const struct object *o);
+void HSH_Ref(struct objcore *o);
 void HSH_Drop(struct sess *sp);
 double HSH_Grace(double g);
 void HSH_Init(void);