X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=oss_write.c;h=6525afa48fca41a9f42d01f36d36315f054c3cf5;hp=d0cff0150bf9c7690ffe2eb37f0a55b46d142c00;hb=f32c0776882e01913c64c8ccbf2d94e0fb4d6369;hpb=e90440367f744a7723b201a95888e66f070ffa92

diff --git a/oss_write.c b/oss_write.c
index d0cff015..6525afa4 100644
--- a/oss_write.c
+++ b/oss_write.c
@@ -174,6 +174,7 @@ static void oss_post_select(__a_unused struct sched *s,
 			goto out;
 		return;
 	}
+	btr_merge(btrn, wn->min_iqs);
 	bytes = btr_next_buffer(btrn, &data);
 	frames = bytes / powd->bytes_per_frame;
 	if (!frames) { /* eof and less than a single frame available */
@@ -183,7 +184,7 @@ static void oss_post_select(__a_unused struct sched *s,
 	ret = 0;
 	if (!FD_ISSET(powd->fd, &s->wfds))
 		goto out;
-	ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame, 0);
+	ret = write_nonblock(powd->fd, data, frames * powd->bytes_per_frame);
 	if (ret < 0)
 		goto out;
 	btr_consume(btrn, ret);