name cleanup

src/node.c

@@ -661,7 +661,7 @@ push_data(struct req *req, struct bytes_tree *tree,
  * returns VDP_bytes upon any error
  */
 static int
-push_worklist(struct req *req, struct bytes_tree *tree,
+worklist_push(struct req *req, struct bytes_tree *tree,
     struct node_head *work)
 {
 	struct node *node, *next, *parent;
@@ -747,7 +747,7 @@ push_worklist(struct req *req, struct bytes_tree *tree,
 }
 
 static void
-bytes_set_delivered_worklist(struct bytes_tree *tree,
+worklist_set_delivered(struct bytes_tree *tree,
     struct node_head *work)
 {
 	struct node *node;
@@ -769,7 +769,7 @@ bytes_set_delivered_worklist(struct bytes_tree *tree,
 	} while(0)
 
 static void
-unpend_worklist(struct req *req, struct bytes_tree *tree,
+worklist_unpend(struct req *req, struct bytes_tree *tree,
     struct node_head *work)
 {
 	struct node *node, *next;
@@ -924,7 +924,7 @@ unpend_worklist(struct req *req, struct bytes_tree *tree,
 #undef set_front
 
 void
-bytes_unpend(struct req *req, struct bytes_tree *tree)
+tree_deliver(struct req *req, struct bytes_tree *tree)
 {
 	struct node_head work;
 	int retval;
@@ -944,19 +944,19 @@ bytes_unpend(struct req *req, struct bytes_tree *tree)
 
 		VSTAILQ_INIT(&work);
 
-		unpend_worklist(req, tree, &work);
+		worklist_unpend(req, tree, &work);
 		if (VSTAILQ_EMPTY(&work) || tree->retval)
 			break;
 
 		Lck_Unlock(&tree->tree_lock);
-		retval = push_worklist(req, tree, &work);
+		retval = worklist_push(req, tree, &work);
 		Lck_Lock(&tree->tree_lock);
 
 		if (retval) {
 			tree->retval = retval;
 			break;
 		}
-		bytes_set_delivered_worklist(tree, &work);
+		worklist_set_delivered(tree, &work);
 	} while (1);
 
 	tree->unpend_owner = NULL;

src/node.h

@@ -256,4 +256,4 @@ void tree_free(struct req *, struct node *);
 
 //--------------
 
-void bytes_unpend(struct req *, struct bytes_tree *);
+void tree_deliver(struct req *, struct bytes_tree *);

src/vdp_pesi.c

@@ -628,7 +628,7 @@ pesi_buf_bytes(struct req *req, enum vdp_action act, void **priv,
 		if (parent->state == ST_PRIVATE)
 			set_open(tree, parent, req->wrk);
 		assert(parent->state = ST_OPEN);
-		bytes_unpend(req, tree);
+		tree_deliver(req, tree);
 		Lck_Unlock(&tree->tree_lock);
 	}
 
@@ -1069,7 +1069,7 @@ vdp_pesi_bytes(struct req *req, enum vdp_action act, void **priv,
 			vped_close_vdp(req, 1, &VDP_pesi_buf);
 			assert_vdp_next_not(req, &VDP_pesi);
 
-			bytes_unpend(req, tree);
+			tree_deliver(req, tree);
 			while (!tree->retval
 			       && (tree->root->state != ST_DELIVERED ||
 				   tree->npending > 0)) {
@@ -1086,7 +1086,7 @@ vdp_pesi_bytes(struct req *req, enum vdp_action act, void **priv,
 						    VTIM_real() + 2));
 				AZ(errno);
 #endif
-				bytes_unpend(req, tree);
+				tree_deliver(req, tree);
 			}
 			Lck_Unlock(&tree->tree_lock);