[master] 9011096 Eliminate unneeded boc argument

[Poul-Henning Kamp]

commit 9011096fdb7ade3d4103909e7f5c42585931b81b
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Thu Jan 21 20:56:40 2016 +0000

    Eliminate unneeded boc argument

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index 6f4f890..7cc4c5c 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -852,7 +852,7 @@ typedef int objiterate_f(void *priv, int flush, const void *ptr, ssize_t len);
 int ObjIterate(struct worker *, struct objcore *,
     void *priv, objiterate_f *func);
 int ObjGetSpace(struct worker *, struct objcore *, ssize_t *sz, uint8_t **ptr);
-void ObjExtend(struct worker *, struct objcore *, struct boc *, ssize_t l);
+void ObjExtend(struct worker *, struct objcore *, ssize_t l);
 ssize_t ObjWaitExtend(struct worker *, struct objcore *, struct boc *, ssize_t l);
 void ObjSetState(const struct objcore *, enum boc_state_e next);
 void ObjWaitState(const struct objcore *, enum boc_state_e want);
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index f017f5d..cb0e1d1 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -98,7 +98,7 @@ VFP_Extend(const struct vfp_ctx *vc, ssize_t sz)
 {
 	CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
 
-	ObjExtend(vc->wrk, vc->oc, vc->bo->boc, sz);
+	ObjExtend(vc->wrk, vc->oc, sz);
 }
 
 /**********************************************************************
diff --git a/bin/varnishd/cache/cache_obj.c b/bin/varnishd/cache/cache_obj.c
index 986254f..00fc45d 100644
--- a/bin/varnishd/cache/cache_obj.c
+++ b/bin/varnishd/cache/cache_obj.c
@@ -107,20 +107,20 @@ ObjGetSpace(struct worker *wrk, struct objcore *oc, ssize_t *sz, uint8_t **ptr)
  */
 
 void
-ObjExtend(struct worker *wrk, struct objcore *oc, struct boc *boc, ssize_t l)
+ObjExtend(struct worker *wrk, struct objcore *oc, ssize_t l)
 {
 	const struct obj_methods *om = obj_getmethods(oc);
 
 	CHECK_OBJ_NOTNULL(wrk, WORKER_MAGIC);
+	CHECK_OBJ_ORNULL(oc->boc, BOC_MAGIC);
 	AN(om->objextend);
 	assert(l > 0);
 
-	if (boc != NULL) {
-		CHECK_OBJ_NOTNULL(boc, BOC_MAGIC);
-		Lck_Lock(&boc->mtx);
+	if (oc->boc != NULL) {
+		Lck_Lock(&oc->boc->mtx);
 		om->objextend(wrk, oc, l);
-		AZ(pthread_cond_broadcast(&boc->cond));
-		Lck_Unlock(&boc->mtx);
+		AZ(pthread_cond_broadcast(&oc->boc->cond));
+		Lck_Unlock(&oc->boc->mtx);
 	} else {
 		om->objextend(wrk, oc, l);
 	}
diff --git a/bin/varnishd/cache/cache_req_body.c b/bin/varnishd/cache/cache_req_body.c
index dbdf15d..c3fd142 100644
--- a/bin/varnishd/cache/cache_req_body.c
+++ b/bin/varnishd/cache/cache_req_body.c
@@ -254,7 +254,7 @@ VRB_Cache(struct req *req, ssize_t maxsize)
 			req->acct.req_bodybytes += l;
 			if (yet >= l)
 				yet -= l;
-			ObjExtend(req->wrk, req->body_oc, NULL, l);
+			ObjExtend(req->wrk, req->body_oc, l);
 		}
 
 	} while (vfps == VFP_OK);
diff --git a/bin/varnishd/cache/cache_req_fsm.c b/bin/varnishd/cache/cache_req_fsm.c
index 8686634..1ba9642 100644
--- a/bin/varnishd/cache/cache_req_fsm.c
+++ b/bin/varnishd/cache/cache_req_fsm.c
@@ -291,7 +291,7 @@ cnt_synth(struct worker *wrk, struct req *req)
 		sz = szl;
 		if (ObjGetSpace(wrk, req->objcore, &sz, &ptr) && sz >= szl) {
 			memcpy(ptr, VSB_data(synth_body), szl);
-			ObjExtend(wrk, req->objcore, NULL, szl);
+			ObjExtend(wrk, req->objcore, szl);
 		} else
 			szl = -1;
 	}