X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=buffer_tree.c;h=b7420ebeeb38e70f85ad4c9f34fa215b59504f61;hb=dfecdabf4aa13e3587b7c73be0f051693dab4d20;hp=1bc9529884dc16b779ee232022e6bb37ccee0e2d;hpb=509881dc2004a449e1da378ca22b164546a50d32;p=paraslash.git

diff --git a/buffer_tree.c b/buffer_tree.c
index 1bc95298..b7420ebe 100644
--- a/buffer_tree.c
+++ b/buffer_tree.c
@@ -225,15 +225,13 @@ size_t btr_get_input_queue_size(struct btr_node *btrn)
 	return size;
 }
 
-int btr_splice_out_node(struct btr_node *btrn)
+void btr_splice_out_node(struct btr_node *btrn)
 {
 	struct btr_node *ch, *tmp;
 
-	if (!btrn)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
-	if (btr_get_input_queue_size(btrn) != 0)
-		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	assert(btrn);
 	PARA_NOTICE_LOG("splicing out %s\n", btrn->name);
+	btr_pushdown(btrn);
 	if (btrn->parent)
 		list_del(&btrn->node);
 	FOR_EACH_CHILD_SAFE(ch, tmp, btrn) {