rip out the oc_flags_removed hack

src/vdp_pesi.c

@@ -160,7 +160,6 @@ struct node_subreq {
 	struct boc		*boc;
 	// oc is NULL if already transferred back into req
 	struct objcore		*oc;
-	uint8_t		oc_flags_removed;
 	// subreq to topreq delivery
 	int			done;
 	pthread_cond_t		cond;
@@ -1240,18 +1239,10 @@ subreq_fixup(struct node *node, struct req *req)
 	if (subreq->objcore != NULL) {
 		CHECK_OBJ_NOTNULL(subreq->objcore, OBJCORE_MAGIC);
 		AZ(node->subreq.oc);
-		AZ(node->subreq.oc_flags_removed);
 	}
 	else {
 		TAKE_OBJ_NOTNULL(subreq->objcore, &node->subreq.oc,
 		    OBJCORE_MAGIC);
-		if (node->subreq.oc_flags_removed != 0) {
-			Lck_Lock(&subreq->objcore->objhead->mtx);
-			subreq->objcore->flags |=
-				node->subreq.oc_flags_removed;
-			Lck_Unlock(&subreq->objcore->objhead->mtx);
-			node->subreq.oc_flags_removed = 0;
-		}
 	}
 
 	if (subreq->wrk != NULL)
@@ -1407,6 +1398,8 @@ push_subreq(struct req *req, struct bytes_tree *tree,
 
 	subreq_fixup(node, req);
 
+	AZ(node->subreq.req->objcore->flags & OC_F_FINAL);
+
 	VSLdbg(req, "DeliverObj from top");
 	VDP_DeliverObj(node->subreq.req);
 
@@ -2474,6 +2467,7 @@ vped_deliver(struct req *req, struct boc *boc, int wantbody)
 	else if (!ObjHasAttr(req->wrk, req->objcore, OA_ESIDATA)) {
 		VSLdbg(req, "vped_deliver: T_SUBREQ");
 		/* XXX WIP / STILL HACKY */
+		AZ(req->objcore->flags & OC_F_FINAL);
 		XXXAZ(push_vdps_NOesi(req));
 
 		node = pesi->pecx->node;
@@ -2498,17 +2492,6 @@ vped_deliver(struct req *req, struct boc *boc, int wantbody)
 		HSH_Ref(req->objcore);
 		node->subreq.oc = req->objcore;
 
-		/*
-		 * also, cnt_transmit calls HSH_Cancel which we need to postpone
-		 */
-		if ((req->objcore->flags & OC_F_FINAL) != 0) {
-			Lck_Lock(&req->objcore->objhead->mtx);
-			node->subreq.oc_flags_removed =
-				req->objcore->flags & OC_F_FINAL;
-			req->objcore->flags &= ~OC_F_FINAL;
-			Lck_Unlock(&req->objcore->objhead->mtx);
-		}
-
 		AZ(pthread_cond_init(&node->subreq.cond, NULL));
 
 		if (node->parent == NULL ||