[master] 3fdbad0 Eliminate the body from vfp_ctx, we now only manipulate it through the objcore.

[Poul-Henning Kamp]

commit 3fdbad0318fa2684c9c8f049a4f5b6cc4a6ffe75
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Aug 19 09:53:48 2014 +0000

    Eliminate the body from vfp_ctx, we now only manipulate it through
    the objcore.

diff --git a/bin/varnishd/cache/cache.h b/bin/varnishd/cache/cache.h
index b85cde6..66712b8 100644
--- a/bin/varnishd/cache/cache.h
+++ b/bin/varnishd/cache/cache.h
@@ -466,7 +466,6 @@ struct vfp_ctx {
 	struct vsl_log		*vsl;
 	struct http		*http;
 	struct http		*esi_req;
-	struct body		*body;
 	uint64_t		bodybytes;
 };
 
diff --git a/bin/varnishd/cache/cache_fetch.c b/bin/varnishd/cache/cache_fetch.c
index faad2b1..1abc7c0 100644
--- a/bin/varnishd/cache/cache_fetch.c
+++ b/bin/varnishd/cache/cache_fetch.c
@@ -161,8 +161,6 @@ vbf_beresp2obj(struct busyobj *bo)
 		AZ(ObjSetDouble(bo->vfc, OA_LASTMODIFIED,
 		    floor(bo->fetch_objcore->exp.t_origin)));
 
-	bo->vfc->body = obj->body;
-
 	return (0);
 }
 
diff --git a/bin/varnishd/cache/cache_fetch_proc.c b/bin/varnishd/cache/cache_fetch_proc.c
index 7462105..b4338a5 100644
--- a/bin/varnishd/cache/cache_fetch_proc.c
+++ b/bin/varnishd/cache/cache_fetch_proc.c
@@ -81,10 +81,6 @@ VFP_GetStorage(struct vfp_ctx *vc, ssize_t sz)
 
 	CHECK_OBJ_NOTNULL(vc, VFP_CTX_MAGIC);
 	CHECK_OBJ_NOTNULL(vc->bo, BUSYOBJ_MAGIC);
-	AN(vc->body);
-	st = VTAILQ_LAST(&vc->body->list, storagehead);
-	if (st != NULL && st->len < st->space)
-		return (st);
 
 	AN(vc->stats);
 	l = fetchfrag;
@@ -224,13 +220,10 @@ VFP_Fetch_Body(struct busyobj *bo)
 		}
 
 		CHECK_OBJ_NOTNULL(st, STORAGE_MAGIC);
-		assert(st == VTAILQ_LAST(&bo->vfc->body->list,
-		    storagehead));
 		l = st->space - st->len;
 		AZ(bo->vfc->failed);
 		vfps = VFP_Suck(bo->vfc, st->ptr + st->len, &l);
 		if (l > 0 && vfps != VFP_ERROR) {
-			AZ(VTAILQ_EMPTY(&bo->vfc->body->list));
 			VBO_extend(bo, l);
 		}
 		if (st->len == st->space)