[master] bba570d Remove bo->boc pointer. No longer needed.

[Poul-Henning Kamp]

commit bba570dcdec7c861757afb2b99d28b68d1aa1abe
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jan 21 22:14:14 2016 +0000

    Remove bo->boc pointer.  No longer needed.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 4d58308..ba98386 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -462,8 +462,6 @@ struct busyobj {
 	unsigned		magic;
 #define BUSYOBJ_MAGIC		0x23b95567
 
-	struct boc		*boc;
-
 	char			*end;
 
 	/*
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index 05b5482..0555d98 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -987,17 +987,16 @@ VBF_Fetch(struct worker *wrk, struct req *req, struct objcore *oc,
 	}
 
 	bo = VBO_GetBusyObj(wrk, req);
-	bo->boc = oc->boc;
-
 	CHECK_OBJ_NOTNULL(bo, BUSYOBJ_MAGIC);
+
+	boc = HSH_RefBusy(oc);
+	CHECK_OBJ_NOTNULL(boc, BOC_MAGIC);
+
 	VSLb(bo->vsl, SLT_Begin, "bereq %u %s", VXID(req->vsl->wid), how);
 	VSLb(req->vsl, SLT_Link, "bereq %u %s", VXID(bo->vsl->wid), how);
 
 	THR_SetBusyobj(bo);
 
-	boc = HSH_RefBusy(oc);
-	AN(boc);
-	assert(boc == bo->boc);
 
 	AN(bo->vcl);