From: Andre Noll <maan@systemlinux.org>
Date: Sat, 26 Jun 2010 10:57:06 +0000 (+0200)
Subject: oss_write: Add missing btr_merge().
X-Git-Tag: v0.4.3~11
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=7b20f3f9b6e77a21dc66ba6d4037a90e857ccb4c;ds=sidebyside

oss_write: Add missing btr_merge().

Without this patch, the oss writer could detect an EOF condition
even if more data is available.
---

diff --git a/oss_write.c b/oss_write.c
index da2539d1..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 */