X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=amp_filter.c;h=101224649f93936b163d148d0928bbbc2f23d0fd;hp=c0835f806ad322480cb38e7ca851b1ef78b3e366;hb=d0f36435b0f81368a778fda33f3a7df86830f5ac;hpb=015055963d095abd0e153832f5b3f0fda3ac8306

diff --git a/amp_filter.c b/amp_filter.c
index c0835f80..10122464 100644
--- a/amp_filter.c
+++ b/amp_filter.c
@@ -116,14 +116,18 @@ static void amp_post_select(__a_unused struct sched *s, struct task *t)
 		return;
 	}
 next_buffer:
-	ret = prepare_filter_node(fn);
-	in_bytes = btr_next_buffer(btrn, (char **)&in);
+	ret = btr_node_status(btrn, fn->min_iqs);
 	if (ret < 0)
 		goto err;
-	len = in_bytes / 2;
-	/* len == 0 happens if eof and in_bytes == 1. */
-	if (ret == 0 || len == 0)
+	if (ret == 0)
 		return;
+	btr_merge(btrn, fn->min_iqs);
+	in_bytes = btr_next_buffer(btrn, (char **)&in);
+	len = in_bytes / 2;
+	if (len == 0) { /* eof and in_bytes == 1 */
+		ret = -E_AMP_EOF;
+		goto err;
+	}
 
 	if (inplace)
 		out = in;