]> git.tue.mpg.de Git - paraslash.git/commitdiff
oss_write: Add missing btr_merge().
authorAndre Noll <maan@systemlinux.org>
Sat, 26 Jun 2010 10:57:06 +0000 (12:57 +0200)
committerAndre Noll <maan@systemlinux.org>
Sat, 26 Jun 2010 10:57:06 +0000 (12:57 +0200)
Without this patch, the oss writer could detect an EOF condition
even if more data is available.

oss_write.c

index da2539d157ff9f995ae36090d4d434a9b8aa82bc..6525afa48fca41a9f42d01f36d36315f054c3cf5 100644 (file)
@@ -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 */